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

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2021-02-27 18:16:41 +00:00 committed by GitHub
commit 6e387b7d59
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
45 changed files with 550 additions and 223 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nixos/doc/manual/release-notes/rl-2105.xml
View File

@ -524,6 +524,14 @@ self: super:
data from the device and mix it into the kernel's RNG. data from the device and mix it into the kernel's RNG.
</para> </para>
</listitem> </listitem>
<listitem>
<para>
The default version of ImageMagick has been updated from 6 to 7.
You can use <package>imagemagick6</package>,
<package>imagemagick6_light</package>, and
<package>imagemagick6Big</package> if you need the older version.
</para>
</listitem>
</itemizedlist> </itemizedlist>
</section> </section>

7
pkgs/applications/graphics/ImageMagick/default.nix → pkgs/applications/graphics/ImageMagick/6.x.nix
View File

@ -16,13 +16,13 @@ in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "imagemagick"; pname = "imagemagick";
version = "6.9.11-60"; version = "6.9.12-1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ImageMagick"; owner = "ImageMagick";
repo = "ImageMagick6"; repo = "ImageMagick6";
rev = version; rev = version;
sha256 = "12810882a0kf4zlgyi290z9bjs921m05njbljkjfw6s1hf0mncl0"; sha256 = "1s1zr0fqnm9jl1ni07if2klvf2lfg26dgxdbspksq5xdhsxxn841";
}; };
outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big
@ -77,7 +77,8 @@ stdenv.mkDerivation rec {
''; '';
meta = with lib; { meta = with lib; {
homepage = "http://www.imagemagick.org/"; homepage = "https://legacy.imagemagick.org/";
changelog = "https://legacy.imagemagick.org/script/changelog.php";
description = "A software suite to create, edit, compose, or convert bitmap images"; description = "A software suite to create, edit, compose, or convert bitmap images";
platforms = platforms.linux ++ platforms.darwin; platforms = platforms.linux ++ platforms.darwin;
license = licenses.asl20; license = licenses.asl20;

4
pkgs/applications/misc/cataract/build.nix
View File

@ -5,7 +5,7 @@
, pkg-config , pkg-config
, libxml2 , libxml2
, exiv2 , exiv2
, imagemagick , imagemagick6
, version , version
, sha256 , sha256
, rev }: , rev }:
@ -20,7 +20,7 @@ stdenv.mkDerivation {
}; };
nativeBuildInputs = [ autoreconfHook pkg-config ]; nativeBuildInputs = [ autoreconfHook pkg-config ];
buildInputs = [ glib libxml2 exiv2 imagemagick ]; buildInputs = [ glib libxml2 exiv2 imagemagick6 ];
prePatch = '' prePatch = ''
sed -i 's|#include <exiv2/exif.hpp>|#include <exiv2/exiv2.hpp>|' src/jpeg-utils.cpp sed -i 's|#include <exiv2/exif.hpp>|#include <exiv2/exiv2.hpp>|' src/jpeg-utils.cpp

12
pkgs/applications/networking/browsers/chromium/upstream-info.json
View File

@ -18,9 +18,9 @@
} }
}, },
"beta": { "beta": {
"version": "89.0.4389.58", "version": "89.0.4389.69",
"sha256": "1ppjkilfn84hq55wsb33xswlp1x8v34np5hq2wbh62ny6j8dbvwz", "sha256": "09xs18jm1pvzh7qzi1cfb59bvy4qarympxxkcwj49khsxjy0y341",
"sha256bin64": "1k4f380h2rghn81agdw8bkifpb690sr0ykjgbnis3kl68hbkp8a5", "sha256bin64": "1w3vr929ssdh4q5zq5qpx7s09md99aam51j4hdslhq1ih9zva275",
"deps": { "deps": {
"gn": { "gn": {
"version": "2021-01-07", "version": "2021-01-07",
@ -31,9 +31,9 @@
} }
}, },
"dev": { "dev": {
"version": "90.0.4421.5", "version": "90.0.4427.5",
"sha256": "0605ibr2fr13rmmxs7lw4dh25i9r6ic08ykdr7002m4rp8kxwsw6", "sha256": "034czg6q84lpycgfqbcg3rrdhja3bp1akvsnyddimwxy83r2cqyg",
"sha256bin64": "05mlm9l6q1w9rxid7cvaazzbw79wj9fjw6ka7wpr0gz4r3gmazsb", "sha256bin64": "0ijvsjfwmssvl14wg9cbp4h2rfdack6f89pmx2fggbnfm26m2vap",
"deps": { "deps": {
"gn": { "gn": {
"version": "2021-02-09", "version": "2021-02-09",

4
pkgs/applications/office/paperless/default.nix
View File

@ -5,7 +5,7 @@
, callPackage , callPackage
, python3 , python3
, imagemagick7 , imagemagick
, ghostscript , ghostscript
, optipng , optipng
, tesseract , tesseract
@ -65,7 +65,7 @@ let
buildPhase = let buildPhase = let
# Paperless has explicit runtime checks that expect these binaries to be in PATH # Paperless has explicit runtime checks that expect these binaries to be in PATH
extraBin = lib.makeBinPath [ imagemagick7 ghostscript optipng tesseract unpaper ]; extraBin = lib.makeBinPath [ imagemagick ghostscript optipng tesseract unpaper ];
in '' in ''
${python.interpreter} -m compileall $srcDir ${python.interpreter} -m compileall $srcDir

2
pkgs/applications/science/physics/sherpa/default.nix
View File

@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "1iwa17s8ipj6a2b8zss5csb1k5y9s5js38syvq932rxcinbyjsl4"; sha256 = "1iwa17s8ipj6a2b8zss5csb1k5y9s5js38syvq932rxcinbyjsl4";
}; };
postPatch = '' postPatch = lib.optional (stdenv.hostPlatform.libc == "glibc") ''
sed -ie '/sys\/sysctl.h/d' ATOOLS/Org/Run_Parameter.C sed -ie '/sys\/sysctl.h/d' ATOOLS/Org/Run_Parameter.C
''; '';

5
pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix
View File

@ -82,7 +82,10 @@ let result = stdenv.mkDerivation rec {
EOF EOF
# We cannot use -exec since wrapProgram is a function but not a command. # We cannot use -exec since wrapProgram is a function but not a command.
for bin in $( find "$out" -executable -type f ); do #
# jspawnhelper is executed from JVM, so it doesn't need to wrap it, and it
# breaks building OpenJDK (#114495).
for bin in $( find "$out" -executable -type f -not -name jspawnhelper ); do
if patchelf --print-interpreter "$bin" &> /dev/null; then if patchelf --print-interpreter "$bin" &> /dev/null; then
wrapProgram "$bin" --prefix LD_LIBRARY_PATH : "${runtimeLibraryPath}" wrapProgram "$bin" --prefix LD_LIBRARY_PATH : "${runtimeLibraryPath}"
fi fi

5
pkgs/development/compilers/graalvm/community-edition.nix
View File

@ -189,7 +189,10 @@ let
preFixup = '' preFixup = ''
# We cannot use -exec since wrapProgram is a function but not a # We cannot use -exec since wrapProgram is a function but not a
# command. # command.
for bin in $( find "$out" -executable -type f -not -path '*/languages/ruby/lib/gems/*' ); do #
# jspawnhelper is executed from JVM, so it doesn't need to wrap it,
# and it breaks building OpenJDK (#114495).
for bin in $( find "$out" -executable -type f -not -path '*/languages/ruby/lib/gems/*' -not -name jspawnhelper ); do
if patchelf --print-interpreter "$bin" &> /dev/null || head -n 1 "$bin" | grep '^#!' -q; then if patchelf --print-interpreter "$bin" &> /dev/null || head -n 1 "$bin" | grep '^#!' -q; then
wrapProgram "$bin" \ wrapProgram "$bin" \
--prefix LD_LIBRARY_PATH : "${runtimeLibraryPath}" --prefix LD_LIBRARY_PATH : "${runtimeLibraryPath}"

5
pkgs/development/compilers/zulu/default.nix
View File

@ -81,7 +81,10 @@ in stdenv.mkDerivation {
EOF EOF
'' + lib.optionalString stdenv.isLinux '' '' + lib.optionalString stdenv.isLinux ''
# We cannot use -exec since wrapProgram is a function but not a command. # We cannot use -exec since wrapProgram is a function but not a command.
for bin in $( find "$out" -executable -type f ); do #
# jspawnhelper is executed from JVM, so it doesn't need to wrap it, and it
# breaks building OpenJDK (#114495).
for bin in $( find "$out" -executable -type f -not -name jspawnhelper ); do
wrapProgram "$bin" --prefix LD_LIBRARY_PATH : "${runtimeLibraryPath}" wrapProgram "$bin" --prefix LD_LIBRARY_PATH : "${runtimeLibraryPath}"
done done
''; '';

23
pkgs/development/libraries/libdmtx/default.nix
View File

@ -1,18 +1,27 @@
{ lib, stdenv, fetchurl, pkg-config }: { lib
, stdenv
, fetchFromGitHub
, autoreconfHook
, pkg-config
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libdmtx-0.7.4"; pname = "libdmtx";
version = "0.7.5";
src = fetchurl { src = fetchFromGitHub {
url = "mirror://sourceforge/libdmtx/${name}.tar.bz2"; owner = "dmtx";
sha256 = "0xnxx075ycy58n92yfda2z9zgd41h3d4ik5d9l197lzsqim5hb5n"; repo = "libdmtx";
rev = "v${version}";
sha256 = "0wk3fkxzf9ip75v8ia54v6ywx72ajp5s6777j4ay8barpbv869rj";
}; };
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ autoreconfHook pkg-config ];
meta = { meta = {
description = "An open source software for reading and writing Data Matrix barcodes"; description = "An open source software for reading and writing Data Matrix barcodes";
homepage = "http://libdmtx.org"; homepage = "https://github.com/dmtx/libdmtx";
changelog = "https://github.com/dmtx/libdmtx/blob/v${version}/ChangeLog";
platforms = lib.platforms.all; platforms = lib.platforms.all;
maintainers = [ ]; maintainers = [ ];
license = lib.licenses.bsd2; license = lib.licenses.bsd2;

9
pkgs/development/libraries/vapoursynth/default.nix
View File

@ -2,13 +2,10 @@
, runCommandCC, runCommand, vapoursynth, writeText, patchelf, buildEnv , runCommandCC, runCommand, vapoursynth, writeText, patchelf, buildEnv
, zimg, libass, python3, libiconv , zimg, libass, python3, libiconv
, ApplicationServices , ApplicationServices
, ocrSupport ? false, tesseract ? null , ocrSupport ? false, tesseract
, imwriSupport? true, imagemagick7 ? null , imwriSupport ? true, imagemagick
}: }:
assert ocrSupport -> tesseract != null;
assert imwriSupport -> imagemagick7 != null;
with lib; with lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -32,7 +29,7 @@ stdenv.mkDerivation rec {
(python3.withPackages (ps: with ps; [ sphinx cython ])) (python3.withPackages (ps: with ps; [ sphinx cython ]))
] ++ optionals stdenv.isDarwin [ libiconv ApplicationServices ] ] ++ optionals stdenv.isDarwin [ libiconv ApplicationServices ]
++ optional ocrSupport tesseract ++ optional ocrSupport tesseract
++ optional imwriSupport imagemagick7; ++ optional imwriSupport imagemagick;
configureFlags = [ configureFlags = [
(optionalString (!ocrSupport) "--disable-ocr") (optionalString (!ocrSupport) "--disable-ocr")

2
pkgs/development/ocaml-modules/mmap/default.nix
View File

@ -4,6 +4,8 @@ buildDunePackage rec {
pname = "mmap"; pname = "mmap";
version = "1.1.0"; version = "1.1.0";
useDune2 = true;
src = fetchurl { src = fetchurl {
url = "https://github.com/mirage/mmap/releases/download/v${version}/mmap-v${version}.tbz"; url = "https://github.com/mirage/mmap/releases/download/v${version}/mmap-v${version}.tbz";
sha256 = "0l6waidal2n8mkdn74avbslvc10sf49f5d889n838z03pra5chsc"; sha256 = "0l6waidal2n8mkdn74avbslvc10sf49f5d889n838z03pra5chsc";

4
pkgs/development/ocaml-modules/ocaml-result/default.nix
View File

@ -1,9 +1,11 @@
{ lib, buildDunePackage, fetchurl }: { lib, buildDunePackage, fetchurl, ocaml }:
buildDunePackage rec { buildDunePackage rec {
pname = "result"; pname = "result";
version = "1.5"; version = "1.5";
useDune2 = lib.versionAtLeast ocaml.version "4.08";
src = fetchurl { src = fetchurl {
url = "https://github.com/janestreet/result/releases/download/${version}/result-${version}.tbz"; url = "https://github.com/janestreet/result/releases/download/${version}/result-${version}.tbz";
sha256 = "0cpfp35fdwnv3p30a06wd0py3805qxmq3jmcynjc3x2qhlimwfkw"; sha256 = "0cpfp35fdwnv3p30a06wd0py3805qxmq3jmcynjc3x2qhlimwfkw";

4
pkgs/development/php-packages/composer/2.0.nix → pkgs/development/php-packages/composer/1.x.nix
View File

@ -1,14 +1,14 @@
{ mkDerivation, fetchurl, makeWrapper, unzip, lib, php }: { mkDerivation, fetchurl, makeWrapper, unzip, lib, php }:
let let
pname = "composer"; pname = "composer";
version = "2.0.11"; version = "1.10.15";
in in
mkDerivation { mkDerivation {
inherit pname version; inherit pname version;
src = fetchurl { src = fetchurl {
url = "https://getcomposer.org/download/${version}/composer.phar"; url = "https://getcomposer.org/download/${version}/composer.phar";
sha256 = "sha256-6r8pFwcglqlGeRk3YlATGeYh4rNppKElaywn9OaYRHc="; sha256 = "1shsxsrc2kq74s1jbq3njn9wzidcz7ak66n9vyz8z8d0hqpg37d6";
}; };
dontUnpack = true; dontUnpack = true;

4
pkgs/development/php-packages/composer/default.nix
View File

@ -1,14 +1,14 @@
{ mkDerivation, fetchurl, makeWrapper, unzip, lib, php }: { mkDerivation, fetchurl, makeWrapper, unzip, lib, php }:
let let
pname = "composer"; pname = "composer";
version = "1.10.15"; version = "2.0.11";
in in
mkDerivation { mkDerivation {
inherit pname version; inherit pname version;
src = fetchurl { src = fetchurl {
url = "https://getcomposer.org/download/${version}/composer.phar"; url = "https://getcomposer.org/download/${version}/composer.phar";
sha256 = "1shsxsrc2kq74s1jbq3njn9wzidcz7ak66n9vyz8z8d0hqpg37d6"; sha256 = "sha256-6r8pFwcglqlGeRk3YlATGeYh4rNppKElaywn9OaYRHc=";
}; };
dontUnpack = true; dontUnpack = true;

4
pkgs/development/php-packages/imagick/default.nix
View File

@ -1,4 +1,4 @@
{ buildPecl, fetchpatch, lib, imagemagick7, pkg-config, pcre' }: { buildPecl, fetchpatch, lib, imagemagick, pkg-config, pcre' }:
buildPecl { buildPecl {
pname = "imagick"; pname = "imagick";
@ -19,7 +19,7 @@ buildPecl {
}) })
]; ];
configureFlags = [ "--with-imagick=${imagemagick7.dev}" ]; configureFlags = [ "--with-imagick=${imagemagick.dev}" ];
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ pcre' ]; buildInputs = [ pcre' ];

2
pkgs/development/php-packages/mongodb/default.nix
View File

@ -15,7 +15,7 @@ buildPecl {
snappy snappy
zlib zlib
pcre' pcre'
] ++ lib.optionals (stdenv.isDarwin) darwin.apple_sdk.frameworks.Security; ] ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security;
meta.maintainers = lib.teams.php.members; meta.maintainers = lib.teams.php.members;
} }

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

@ -1,7 +1,7 @@
{ lib { lib
, buildPythonPackage , buildPythonPackage
, fetchPypi , fetchPypi
, imagemagick7Big , imagemagickBig
}: }:
buildPythonPackage rec { buildPythonPackage rec {
@ -16,13 +16,13 @@ buildPythonPackage rec {
postPatch = '' postPatch = ''
substituteInPlace wand/api.py --replace \ substituteInPlace wand/api.py --replace \
"magick_home = os.environ.get('MAGICK_HOME')" \ "magick_home = os.environ.get('MAGICK_HOME')" \
"magick_home = '${imagemagick7Big}'" "magick_home = '${imagemagickBig}'"
''; '';
# tests not included with pypi release # tests not included with pypi release
doCheck = false; doCheck = false;
passthru.imagemagick = imagemagick7Big; passthru.imagemagick = imagemagickBig;
meta = with lib; { meta = with lib; {
description = "Ctypes-based simple MagickWand API binding for Python"; description = "Ctypes-based simple MagickWand API binding for Python";

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

@ -11,12 +11,12 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "azure-mgmt-web"; pname = "azure-mgmt-web";
version = "1.0.0"; version = "2.0.0";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
extension = "zip"; extension = "zip";
sha256 = "c4b218a5d1353cd7c55b39c9b2bd1b13bfbe3b8a71bc735122b171eab81670d1"; sha256 = "0040e1c9c795f7bebe43647ff30b62cb0db7175175df5cbfa1e554a6a277b81e";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

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

@ -9,11 +9,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "databricks-cli"; pname = "databricks-cli";
version = "0.14.1"; version = "0.14.2";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "bf94dc5187fa3500a31d52d7225fbc1a4699aa6e3c321223e7088eb5b5c94b62"; sha256 = "9e956f0efb7aad100d9963f223db986392cf2dc3e9922f2f83e55d372e84ef16";
}; };
checkInputs = [ checkInputs = [

25
pkgs/development/python-modules/graphql-relay/default.nix
View File

@ -1,17 +1,32 @@
{ lib, buildPythonPackage, fetchPypi, graphql-core, pytestCheckHook }: { lib
, buildPythonPackage
, fetchPypi
, graphql-core
, pytest-asyncio
, pytestCheckHook
, pythonOlder
, typing-extensions
}:
buildPythonPackage rec { buildPythonPackage rec {
pname = "graphql-relay"; pname = "graphql-relay";
version = "3.0.0"; version = "3.1.0";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "0mjmpf4abrxfyln0ykxq4xa6lp7xwgqr8631qp011hv0nfl6jgxd"; sha256 = "sha256-cNWn7lmV6nwqmjflEidmOxpGTx9A6Y/d6VC+VBXf4LQ=";
}; };
propagatedBuildInputs = [ graphql-core ]; propagatedBuildInputs = [
graphql-core
] ++ lib.optionals (pythonOlder "3.8") [
typing-extensions
];
checkInputs = [ pytestCheckHook ]; checkInputs = [
pytest-asyncio
pytestCheckHook
];
pythonImportsCheck = [ "graphql_relay" ]; pythonImportsCheck = [ "graphql_relay" ];

48
pkgs/development/python-modules/graphtage/default.nix Normal file
View File

@ -0,0 +1,48 @@
{ buildPythonPackage
, fetchFromGitHub
, lib
, pytestCheckHook
, pythonOlder
# Python dependencies
, colorama
, intervaltree
, json5
, pyyaml
, scipy
, tqdm
, typing-extensions
}:
buildPythonPackage rec {
pname = "graphtage";
version = "0.2.5";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "trailofbits";
repo = pname;
rev = "v${version}";
sha256 = "sha256-cFOTbPv7CnRdet7bx5LVq5xp9LG4yNm0oxlW5aSEeZs=";
};
propagatedBuildInputs = [
colorama
intervaltree
json5
pyyaml
scipy
tqdm
typing-extensions
];
checkInputs = [ pytestCheckHook ];
pythonImportsCheck = [ "graphtage" ];
meta = with lib; {
homepage = "https://github.com/trailofbits/graphtage";
description = "A utility to diff tree-like files such as JSON and XML";
license = licenses.lgpl3Plus;
maintainers = with maintainers; [ veehaitch ];
};
}

10
pkgs/development/python-modules/httpcore/default.nix
View File

@ -9,18 +9,20 @@
, pytestcov , pytestcov
, sniffio , sniffio
, uvicorn , uvicorn
, trustme
, trio
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "httpcore"; pname = "httpcore";
version = "0.12.0"; version = "0.12.3";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "encode"; owner = "encode";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "0bwxn7m7r7h6k41swxj0jqj3nzi76wqxwbnry6y7d4qfh4m26g2j"; sha256 = "09hbjc5wzhrnri5y3idxcq329d7jiaxljc7y6npwv9gh9saln109";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
@ -34,11 +36,15 @@ buildPythonPackage rec {
pytestCheckHook pytestCheckHook
pytestcov pytestcov
uvicorn uvicorn
trustme
trio
]; ];
pytestFlagsArray = [ pytestFlagsArray = [
# these tests fail during dns lookups: httpcore.ConnectError: [Errno -2] Name or service not known # these tests fail during dns lookups: httpcore.ConnectError: [Errno -2] Name or service not known
"--ignore=tests/test_threadsafety.py"
"--ignore=tests/sync_tests/test_interfaces.py" "--ignore=tests/sync_tests/test_interfaces.py"
"--ignore=tests/sync_tests/test_retries.py"
]; ];
pythonImportsCheck = [ "httpcore" ]; pythonImportsCheck = [ "httpcore" ];

30
pkgs/development/python-modules/json5/default.nix Normal file
View File

@ -0,0 +1,30 @@
{ buildPythonPackage
, fetchFromGitHub
, hypothesis
, lib
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "json5";
version = "0.9.5";
src = fetchFromGitHub {
owner = "dpranke";
repo = "pyjson5";
rev = "v${version}";
sha256 = "sha256-VkJnZG1BuC49/jJuwObbqAF48CtbWU9rDEYW4Dg0w4U=";
};
checkInputs = [
hypothesis
pytestCheckHook
];
meta = with lib; {
homepage = "https://github.com/dpranke/pyjson5";
description = "A Python implementation of the JSON5 data format";
license = licenses.asl20;
maintainers = with maintainers; [ veehaitch ];
};
}

35
pkgs/development/python-modules/pycec/default.nix Normal file
View File

@ -0,0 +1,35 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, libcec
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "pycec";
version = "0.5.1";
src = fetchFromGitHub {
owner = "konikvranik";
repo = pname;
rev = "v${version}";
sha256 = "1ivnmihajhfkwwghgl0f8n9ragpirbmbj1mhj9bmjjc29zzdc3m6";
};
propagatedBuildInputs = [
libcec
];
checkInputs = [
pytestCheckHook
];
pythonImportsCheck = [ "pycec" ];
meta = with lib; {
description = "Python modules to access HDMI CEC devices";
homepage = "https://github.com/konikvranik/pycec/";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

31
pkgs/development/python-modules/pyswitchbot/default.nix Normal file
View File

@ -0,0 +1,31 @@
{ lib
, bluepy
, buildPythonPackage
, fetchFromGitHub
}:
buildPythonPackage rec {
pname = "pyswitchbot";
version = "0.9.1";
src = fetchFromGitHub {
owner = "Danielhiversen";
repo = "pySwitchbot";
rev = version;
sha256 = "16p11fmyms4q93m3rna76nkp2la9m8lmfmaflbvga666vljwfw6v";
};
propagatedBuildInputs = [ bluepy ];
# Project has no tests
doCheck = false;
pythonImportsCheck = [ "switchbot" ];
meta = with lib; {
description = "Python library to control Switchbot IoT devices";
homepage = "https://github.com/Danielhiversen/pySwitchbot";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
platforms = platforms.linux;
};
}

47
pkgs/development/python-modules/python-awair/default.nix Normal file
View File

@ -0,0 +1,47 @@
{ lib
, aiohttp
, buildPythonPackage
, fetchFromGitHub
, poetry
, pytest-aiohttp
, pytestCheckHook
, pythonOlder
, voluptuous
, vcrpy
}:
buildPythonPackage rec {
pname = "python-awair";
version = "0.2.1";
format = "pyproject";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "ahayworth";
repo = "python_awair";
rev = version;
sha256 = "1fqjigc1a0lr9q6bjjq3j8pa39wg1cbkb0l67w94a0i4dkdfri8r";
};
nativeBuildInputs = [ poetry ];
propagatedBuildInputs = [
aiohttp
voluptuous
];
checkInputs = [
pytest-aiohttp
pytestCheckHook
vcrpy
];
pythonImportsCheck = [ "python_awair" ];
meta = with lib; {
description = "Python library for the Awair API";
homepage = "https://github.com/ahayworth/python_awair";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

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

@ -0,0 +1,37 @@
{ lib
, requests
, buildPythonPackage
, fetchFromGitHub
, pytestCheckHook
, pythonOlder
, requests-mock
}:
buildPythonPackage rec {
pname = "simplehound";
version = "0.6";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "robmarkcole";
repo = pname;
rev = "v${version}";
sha256 = "1b5m3xjmk0l6ynf0yvarplsfsslgklalfcib7sikxg3v5hiv9qwh";
};
propagatedBuildInputs = [ requests ];
checkInputs = [
requests-mock
pytestCheckHook
];
pythonImportsCheck = [ "simplehound" ];
meta = with lib; {
description = "Python API for Sighthound";
homepage = "https://github.com/robmarkcole/simplehound";
license = with licenses; [ asl20 ];
maintainers = with maintainers; [ fab ];
};
}

30
pkgs/development/python-modules/twinkly-client/default.nix Normal file
View File

@ -0,0 +1,30 @@
{ lib
, aiohttp
, buildPythonPackage
, fetchPypi
, pythonOlder
}:
buildPythonPackage rec {
pname = "twinkly-client";
version = "0.0.2";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "16jbm4ya4yk2nfswza1kpgks70rmy5lpsv9dv3hdjdnr1j44hr3i";
};
propagatedBuildInputs = [ aiohttp ];
# Project has no tests
doCheck = false;
pythonImportsCheck = [ "twinkly_client" ];
meta = with lib; {
description = "Python module to communicate with Twinkly LED strings";
homepage = "https://github.com/dr1rrb/py-twinkly-client";
license = with licenses; [ asl20 ];
maintainers = with maintainers; [ fab ];
};
}

6
pkgs/development/tools/documentation/mdsh/default.nix
View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "mdsh"; pname = "mdsh";
version = "0.5.0"; version = "0.6.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "zimbatm"; owner = "zimbatm";
repo = "mdsh"; repo = "mdsh";
rev = "v${version}"; rev = "v${version}";
sha256 = "02xslf5ssmyklbfsif2d7yk5aaz08n5w0dqiid6v4vlr2mkqcpjl"; sha256 = "1ki6w3qf8ipcf7ch5120mj16vs7yan8k9zjd25v8x6vbsd1iccgy";
}; };
cargoSha256 = "118ykkqlf0x6gcgywx4pg3qawfhfr5q5f51gvrw9s302c1lmgk3g"; cargoSha256 = "10iqypz8hfyzy1xd78r39z2waa728d97kfnf1bbx8fr4a4pzan7y";
meta = with lib; { meta = with lib; {
description = "Markdown shell pre-processor"; description = "Markdown shell pre-processor";

4
pkgs/games/portmod/default.nix
View File

@ -1,5 +1,5 @@
{ lib, callPackage, python3Packages, fetchFromGitLab, cacert, { lib, callPackage, python3Packages, fetchFromGitLab, cacert,
rustPlatform, bubblewrap, git, perlPackages, imagemagick7, fetchurl, fetchzip, rustPlatform, bubblewrap, git, perlPackages, imagemagick, fetchurl, fetchzip,
jre, makeWrapper, tr-patcher, tes3cmd }: jre, makeWrapper, tr-patcher, tes3cmd }:
let let
@ -29,7 +29,7 @@ let
python3Packages.virtualenv python3Packages.virtualenv
tr-patcher tr-patcher
tes3cmd tes3cmd
imagemagick7 imagemagick
]; ];
in in

6
pkgs/misc/screensavers/rss-glx/default.nix
View File

@ -1,4 +1,4 @@
{lib, stdenv, fetchurl, pkg-config, xlibsWrapper, libXext, libGLU, libGL, imagemagick, libtiff, bzip2}: {lib, stdenv, fetchurl, pkg-config, xlibsWrapper, libXext, libGLU, libGL, imagemagick6, libtiff, bzip2}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "0.9.1"; version = "0.9.1";
@ -10,9 +10,9 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ libGLU libGL xlibsWrapper imagemagick libtiff bzip2 ]; buildInputs = [ libGLU libGL xlibsWrapper imagemagick6 libtiff bzip2 ];
NIX_CFLAGS_COMPILE = "-I${imagemagick.dev}/include/ImageMagick"; NIX_CFLAGS_COMPILE = "-I${imagemagick6.dev}/include/ImageMagick";
NIX_LDFLAGS= "-rpath ${libXext}/lib"; NIX_LDFLAGS= "-rpath ${libXext}/lib";
meta = { meta = {

10
pkgs/servers/home-assistant/component-packages.nix
View File

@ -63,7 +63,7 @@
"automation" = ps: with ps; [ aiohttp-cors ]; "automation" = ps: with ps; [ aiohttp-cors ];
"avea" = ps: with ps; [ avea ]; "avea" = ps: with ps; [ avea ];
"avion" = ps: with ps; [ avion ]; "avion" = ps: with ps; [ avion ];
"awair" = ps: with ps; [ ]; # missing inputs: python_awair "awair" = ps: with ps; [ python-awair ];
"aws" = ps: with ps; [ aiobotocore ]; "aws" = ps: with ps; [ aiobotocore ];
"axis" = ps: with ps; [ aiohttp-cors axis paho-mqtt ]; "axis" = ps: with ps; [ aiohttp-cors axis paho-mqtt ];
"azure_devops" = ps: with ps; [ ]; # missing inputs: aioazuredevops "azure_devops" = ps: with ps; [ ]; # missing inputs: aioazuredevops
@ -338,7 +338,7 @@
"hassio" = ps: with ps; [ aiohttp-cors pillow ]; "hassio" = ps: with ps; [ aiohttp-cors pillow ];
"haveibeenpwned" = ps: with ps; [ ]; "haveibeenpwned" = ps: with ps; [ ];
"hddtemp" = ps: with ps; [ ]; "hddtemp" = ps: with ps; [ ];
"hdmi_cec" = ps: with ps; [ ]; # missing inputs: pyCEC "hdmi_cec" = ps: with ps; [ pycec ];
"heatmiser" = ps: with ps; [ ]; # missing inputs: heatmiserV3 "heatmiser" = ps: with ps; [ ]; # missing inputs: heatmiserV3
"heos" = ps: with ps; [ ]; # missing inputs: pyheos "heos" = ps: with ps; [ ]; # missing inputs: pyheos
"here_travel_time" = ps: with ps; [ ]; # missing inputs: herepy "here_travel_time" = ps: with ps; [ ]; # missing inputs: herepy
@ -731,7 +731,7 @@
"shopping_list" = ps: with ps; [ aiohttp-cors ]; "shopping_list" = ps: with ps; [ aiohttp-cors ];
"sht31" = ps: with ps; [ ]; # missing inputs: Adafruit-GPIO Adafruit-SHT31 "sht31" = ps: with ps; [ ]; # missing inputs: Adafruit-GPIO Adafruit-SHT31
"sigfox" = ps: with ps; [ ]; "sigfox" = ps: with ps; [ ];
"sighthound" = ps: with ps; [ pillow ]; # missing inputs: simplehound "sighthound" = ps: with ps; [ pillow simplehound ];
"signal_messenger" = ps: with ps; [ ]; # missing inputs: pysignalclirestapi "signal_messenger" = ps: with ps; [ ]; # missing inputs: pysignalclirestapi
"simplepush" = ps: with ps; [ ]; # missing inputs: simplepush "simplepush" = ps: with ps; [ ]; # missing inputs: simplepush
"simplisafe" = ps: with ps; [ ]; # missing inputs: simplisafe-python "simplisafe" = ps: with ps; [ ]; # missing inputs: simplisafe-python
@ -801,7 +801,7 @@
"swiss_public_transport" = ps: with ps; [ python-opendata-transport ]; "swiss_public_transport" = ps: with ps; [ python-opendata-transport ];
"swisscom" = ps: with ps; [ ]; "swisscom" = ps: with ps; [ ];
"switch" = ps: with ps; [ ]; "switch" = ps: with ps; [ ];
"switchbot" = ps: with ps; [ ]; # missing inputs: PySwitchbot "switchbot" = ps: with ps; [ pyswitchbot ];
"switcher_kis" = ps: with ps; [ aioswitcher ]; "switcher_kis" = ps: with ps; [ aioswitcher ];
"switchmate" = ps: with ps; [ ]; # missing inputs: pySwitchmate "switchmate" = ps: with ps; [ ]; # missing inputs: pySwitchmate
"syncthru" = ps: with ps; [ url-normalize ]; # missing inputs: pysyncthru "syncthru" = ps: with ps; [ url-normalize ]; # missing inputs: pysyncthru
@ -870,7 +870,7 @@
"twilio" = ps: with ps; [ aiohttp-cors twilio ]; "twilio" = ps: with ps; [ aiohttp-cors twilio ];
"twilio_call" = ps: with ps; [ aiohttp-cors twilio ]; "twilio_call" = ps: with ps; [ aiohttp-cors twilio ];
"twilio_sms" = ps: with ps; [ aiohttp-cors twilio ]; "twilio_sms" = ps: with ps; [ aiohttp-cors twilio ];
"twinkly" = ps: with ps; [ ]; # missing inputs: twinkly-client "twinkly" = ps: with ps; [ twinkly-client ];
"twitch" = ps: with ps; [ python-twitch-client ]; "twitch" = ps: with ps; [ python-twitch-client ];
"twitter" = ps: with ps; [ twitterapi ]; "twitter" = ps: with ps; [ twitterapi ];
"ubus" = ps: with ps; [ ]; "ubus" = ps: with ps; [ ];

162
pkgs/tools/admin/pulumi/data.nix
View File

@ -1,178 +1,178 @@
# DO NOT EDIT! This file is generated automatically by update.sh # DO NOT EDIT! This file is generated automatically by update.sh
{ }: { }:
{ {
version = "2.19.0"; version = "2.21.2";
pulumiPkgs = { pulumiPkgs = {
x86_64-linux = [ x86_64-linux = [
{ {
url = "https://get.pulumi.com/releases/sdk/pulumi-v2.19.0-linux-x64.tar.gz"; url = "https://get.pulumi.com/releases/sdk/pulumi-v2.21.2-linux-x64.tar.gz";
sha256 = "0641inzkbgrjarc7jdmi0iryx4swjh1ayf0j15ais3yij7jq4da2"; sha256 = "1zspkrfrrgkk8yhsa8lccky9as1v0nmz7wqxkfnx707nc986w5a3";
} }
{ {
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v1.5.2-linux-amd64.tar.gz"; url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v1.8.1-linux-amd64.tar.gz";
sha256 = "1jrv87r55m1kzl48zs5vh83v2kh011gm4dha80ijqjhryx0a94jy"; sha256 = "0yzz24fhkd1ij3gvsgi48czpm30lwbzdswsfir1mdq0a6wwhll4w";
} }
{ {
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v3.25.1-linux-amd64.tar.gz"; url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v3.30.1-linux-amd64.tar.gz";
sha256 = "0yfrpih5q2hfj2555y26l1pqs22idh4hqn20gy310kg12r303hwk"; sha256 = "1ml980mxhah193k4w75nvh7yzlc0j4k1sm9f51pvihxzmq5hjzgz";
} }
{ {
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v2.11.1-linux-amd64.tar.gz"; url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v2.13.1-linux-amd64.tar.gz";
sha256 = "18gyan0dszfvx8fhvi8r2msbf8n9lbh10pnvcaqvdk8cr79lnzl9"; sha256 = "12f6knxnpkdh00w0s9a9fqk934n5ry7k473sk42gz024j253pq8g";
} }
{ {
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v2.7.0-linux-amd64.tar.gz"; url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v2.8.1-linux-amd64.tar.gz";
sha256 = "05nmdjgwhm1pi5zljq33812wgkz1rpisjrvdn8lcsapwz3fchbjd"; sha256 = "1g1rbvi3yizxs007hp0zgfysbam20gfg4xkc69gpwishy0j0m14q";
} }
{ {
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v2.15.0-linux-amd64.tar.gz"; url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v2.16.1-linux-amd64.tar.gz";
sha256 = "12wjh0w7i1f6rd5r4pqc98ix4mkrkqwnvpv7hkcsn90rsxrlfysk"; sha256 = "1v4zf3z6vcz074yay97kczh5dv9ii5mmkas57j6jqgpfm1lqymil";
} }
{ {
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v3.3.0-linux-amd64.tar.gz"; url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v3.5.1-linux-amd64.tar.gz";
sha256 = "19cpq6hwj862wmfcfx732j66wjkfjnxjrqj4bgxpgah62hrl5lh2"; sha256 = "02angr4bimgir42n0jdf69005fzkikknfvyxgdh8kpr555lbb17a";
} }
{ {
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v2.7.0-linux-amd64.tar.gz"; url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v2.8.1-linux-amd64.tar.gz";
sha256 = "0mb6ddidyk3g1ayk8y0ypb262fyv584w5cicvjc5r9670a1d2rcv"; sha256 = "13987spi37vb7b6cd12axyvc2r2lvy1if1lwssxxj7jl95bss1d9";
} }
{ {
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v4.9.0-linux-amd64.tar.gz"; url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v4.12.0-linux-amd64.tar.gz";
sha256 = "1b5m2620s4bqq6zlagki3w4fzph3lc5192falv8ick4rgbv714nb"; sha256 = "0srdmga79r2jh3mv4vcb0gnhmkky666v902vd20bbr1r2fmi8wji";
} }
{ {
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v2.5.1-linux-amd64.tar.gz"; url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v3.2.0-linux-amd64.tar.gz";
sha256 = "10cmnsxpiy7bfxyrpwfqn5kgpijlkxrhfah40wd82j3j2b7wy33j"; sha256 = "07qg1vmbmjc6shz2nw37vcrccd7m6ghb0h9zjp0gvzks1b2fz32i";
} }
{ {
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v3.5.0-linux-amd64.tar.gz"; url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v3.7.0-linux-amd64.tar.gz";
sha256 = "10d5gmhax02906jpr9nmb80xfxvy2ym8vjyj31sz2mcl9jnadk4z"; sha256 = "19d83ydqh6fi7rl3j1gkmrnnbkijw4pj4rvkk1w3s842jsiqxlr9";
} }
{ {
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v0.5.1-linux-amd64.tar.gz"; url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v0.6.2-linux-amd64.tar.gz";
sha256 = "0fi8qxv6ladpapb6j0w7zqk0hxj56iy1131dsipzkkx4p1jfg27r"; sha256 = "01kyqw5x2jv0il8w4mg0man2dzikghdz4kirk3nabkm6fwncngk1";
} }
{ {
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v2.7.8-linux-amd64.tar.gz"; url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v2.8.2-linux-amd64.tar.gz";
sha256 = "0ah0yhwf79dgk7biifnapz0366mm5a54rlqf8hffn13czqnc3qbq"; sha256 = "01jcilqw1z7klk8xa0z3c5rh6fi5c2xxr6sqw9qmmwgh1ncpdmhi";
} }
{ {
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v2.3.2-linux-amd64.tar.gz"; url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v2.4.1-linux-amd64.tar.gz";
sha256 = "1c39fk37kx093n0ldk8szblgcx0hviyyd7mxzp7nb97s4rvmf48l"; sha256 = "1ayjs4s6zv5lsr74y1zjicngqj111hp8zb5gmlr4x2qs5cxnz02n";
} }
{ {
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v2.3.3-linux-amd64.tar.gz"; url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v2.4.1-linux-amd64.tar.gz";
sha256 = "0c2aypx8y6s892y2gygc8116rlarlcw1s2m39gkcdjjbfkmf8za0"; sha256 = "11l6xsn42dr2mx8ayimdc19gn2vsiwq3h1qd716y9snnzkrsiyw7";
} }
{ {
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v2.11.0-linux-amd64.tar.gz"; url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v2.15.0-linux-amd64.tar.gz";
sha256 = "0iqimhqh853jx6zd53z1r98ky0qhxfby9w519xpdlvxxq5aqb6kb"; sha256 = "1xraydxazx620y4m54qwjacmf5vs6x5ci9jymj52vrpd5c4lpw5p";
} }
{ {
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-packet-v3.2.2-linux-amd64.tar.gz"; url = "https://api.pulumi.com/releases/plugins/pulumi-resource-packet-v3.2.2-linux-amd64.tar.gz";
sha256 = "0glbjhgrb2hiyhd6kwmy7v384j8zw641pw9737g1fczv3x16a3s3"; sha256 = "0glbjhgrb2hiyhd6kwmy7v384j8zw641pw9737g1fczv3x16a3s3";
} }
{ {
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v2.5.3-linux-amd64.tar.gz"; url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v2.7.2-linux-amd64.tar.gz";
sha256 = "1rh14rngpcbqly5i3cgwfgi90drkg6fa0gkgpfa7f9mkm4wpgla8"; sha256 = "1lx4yk7wcnbn419zqjyp2aw81q5bg5dqjy74ghbc74qhbbxjz6q0";
} }
{ {
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v3.0.1-linux-amd64.tar.gz"; url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v3.0.3-linux-amd64.tar.gz";
sha256 = "0jpv94kzsa794ds5bjj6j3pj1wxqicavpxjnycfa5cm8w71kmlsh"; sha256 = "0par5cpp787iwxy1dbv9kw946bnvgd4qnzrh0hc4y6468w9k3kbm";
} }
{ {
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v3.3.0-linux-amd64.tar.gz"; url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v3.4.1-linux-amd64.tar.gz";
sha256 = "069sq8lkw4n7ykh2b2fsaggxxr4731riyy9i15idffa52d1kkiq6"; sha256 = "0w8l0py337msdh0w9czbydznchl1h22pkzp2yrj6lx1p9vl4qbmq";
} }
{ {
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v2.11.4-linux-amd64.tar.gz"; url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v2.12.2-linux-amd64.tar.gz";
sha256 = "0lyvpfmjsjxpwq1b74j2jipp36n7zczlxgy0pr6j7c027d26sym6"; sha256 = "1clhdj8jlmhfykirdfp8lkg9grhyyamjimxcy2mxshm6mwlaajcm";
} }
]; ];
x86_64-darwin = [ x86_64-darwin = [
{ {
url = "https://get.pulumi.com/releases/sdk/pulumi-v2.19.0-darwin-x64.tar.gz"; url = "https://get.pulumi.com/releases/sdk/pulumi-v2.21.2-darwin-x64.tar.gz";
sha256 = "02wd0h5aq53zjy18xzbkv7nnl097ja0m783gsgrs1wdlqblwpqyw"; sha256 = "0wijdxlhinjmn2rf7k02iwg1i14xd1v3cxvxssik56yk0mhkm42b";
} }
{ {
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v1.5.2-darwin-amd64.tar.gz"; url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v1.8.1-darwin-amd64.tar.gz";
sha256 = "1rqx2dyx3anmlv74whs587rs1bgyssqxfjzrx1cfpfnnnj5rkmry"; sha256 = "00d66lmsd9ph7dpyrsdini8phlc197ssinfnkl3cj3j5v6hnzah1";
} }
{ {
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v3.25.1-darwin-amd64.tar.gz"; url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v3.30.1-darwin-amd64.tar.gz";
sha256 = "1j4czx1iqfm95y14isl1sqwvsw690h9y0xf2jpynp2ygmc3szrkr"; sha256 = "1p3rp2fq7lfqj03w1y8p21arvrvbbdwcd1nxnnqjnjwq3ahfvwnm";
} }
{ {
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v2.11.1-darwin-amd64.tar.gz"; url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v2.13.1-darwin-amd64.tar.gz";
sha256 = "0dqyd8aywmxrsvipndwrwq5pxv7avzf8kpk6rdyip4j8hp156lbz"; sha256 = "0scx1vwpfan98cx6n2k06bph9xlpc41viirs34lf4mqdm2c2m3k5";
} }
{ {
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v2.7.0-darwin-amd64.tar.gz"; url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v2.8.1-darwin-amd64.tar.gz";
sha256 = "0xbbaphd0lypyzq262rapr42lmyz3wr14xab09qc156rjasr8w64"; sha256 = "1nzrqm3rbqdl4q12ln87p78hfpnmbliavavhbqn3jr2kchfgy9j1";
} }
{ {
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v2.15.0-darwin-amd64.tar.gz"; url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v2.16.1-darwin-amd64.tar.gz";
sha256 = "10izly9m7847rsb533ch3n8rkhbfb3q6lcx80dk5ia8bfdlvc3cn"; sha256 = "0y3qadiyqa5krknkabfy60gjd7kmqjx8w72w8jrv5821bmxs3kzm";
} }
{ {
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v3.3.0-darwin-amd64.tar.gz"; url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v3.5.1-darwin-amd64.tar.gz";
sha256 = "0kyw1csyzvkbzqxrgpf4d2zgydysd4mfb07igjv19m3f7gs8jhr9"; sha256 = "1ksv79cglb6fifx4mrjk32lh25hq2n8yigphsk54lppvhvp9ynyp";
} }
{ {
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v2.7.0-darwin-amd64.tar.gz"; url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v2.8.1-darwin-amd64.tar.gz";
sha256 = "122cf7v12vzv1szi9adcccakbs3hs23qsjbykjrhwmk8hw21g4kb"; sha256 = "1i1kf0mj8pagcm1q2sjlfqc42qv9pgchq8a8qxs1xllxcv2nqp96";
} }
{ {
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v4.9.0-darwin-amd64.tar.gz"; url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v4.12.0-darwin-amd64.tar.gz";
sha256 = "11w4ykh846byg05jxnddm6ln901pms8n5g0q5gj3ldfjrfl1cn2q"; sha256 = "1m02w4szp3dq9klwvi26fdxxdr3pqw77afcxarfxc92dhdq8rp2g";
} }
{ {
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v2.5.1-darwin-amd64.tar.gz"; url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v3.2.0-darwin-amd64.tar.gz";
sha256 = "1apaaa76dq53ppnmh4xi55zsrx1mwbnnsby63ymjw9xhdkc1sah6"; sha256 = "128j5vrvgqzvn2cfdvnw89328fydahaj3i4pmbpk2swgqmn0kac8";
} }
{ {
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v3.5.0-darwin-amd64.tar.gz"; url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v3.7.0-darwin-amd64.tar.gz";
sha256 = "0xfkdmnax10zkgpipxaxfi0lgfgijnvssbwmfsaxxisdxscw2ig9"; sha256 = "1f9scgzzlcq6inl1z9b0xvcd9prr6w8acr20mnki5j1fn0m67sa5";
} }
{ {
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v0.5.1-darwin-amd64.tar.gz"; url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v0.6.2-darwin-amd64.tar.gz";
sha256 = "05h8adn3q7nnhn75vircrnr9nxf15pf82n9gvz5rbq0hsdivh3l2"; sha256 = "099paln0sh7kp8393k264zz0bvrv2p7k7rywgj9ym9dncqq9za2r";
} }
{ {
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v2.7.8-darwin-amd64.tar.gz"; url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v2.8.2-darwin-amd64.tar.gz";
sha256 = "01xspqk3hzvrhka9nsxal8pwji3hm5qgkn49jjnk1cy01hy7s78q"; sha256 = "0afy6aphq14i7ww3a35ybzhwqwlxaybbxbhsa6w63hv3s4fw7wpa";
} }
{ {
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v2.3.2-darwin-amd64.tar.gz"; url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v2.4.1-darwin-amd64.tar.gz";
sha256 = "19v60l2djvigf60zacchfr98kfb8wxk1rmhdswyhhhz41jh30qhl"; sha256 = "1nngzlvx06kphxayqkyn0xrh22dv2pcpb9b0gvlicancbn01ql5w";
} }
{ {
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v2.3.3-darwin-amd64.tar.gz"; url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v2.4.1-darwin-amd64.tar.gz";
sha256 = "15w72087frbx6wyngi20bsssnr7si1bk1h94jav3d4cgm6nhpnwk"; sha256 = "041ml1yx7wk4whq6gfsb1zc49kkdws06dqpr5i910ln5avnhslvq";
} }
{ {
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v2.11.0-darwin-amd64.tar.gz"; url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v2.15.0-darwin-amd64.tar.gz";
sha256 = "05hap76yzss5bsgr20rm8sxb6r3iiwvq75lhf11laaxq2hnb7qdp"; sha256 = "13sy891ff4y53yw7h0p3cynycrxd8hq5pfmdnl7332ll7kls37p3";
} }
{ {
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-packet-v3.2.2-darwin-amd64.tar.gz"; url = "https://api.pulumi.com/releases/plugins/pulumi-resource-packet-v3.2.2-darwin-amd64.tar.gz";
sha256 = "0621njipng32x43lw8n49mapq10lnvibg8vlvgciqsfvrbpz1yp5"; sha256 = "0621njipng32x43lw8n49mapq10lnvibg8vlvgciqsfvrbpz1yp5";
} }
{ {
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v2.5.3-darwin-amd64.tar.gz"; url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v2.7.2-darwin-amd64.tar.gz";
sha256 = "033262l7yylw9y8ifrag2fsdpfvqjmmrxmmhksvysjmz9slb60kg"; sha256 = "0c83zdnx12g2dmvi98v7w3739x91d9lhqx5j6cvq8c24y7lxga78";
} }
{ {
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v3.0.1-darwin-amd64.tar.gz"; url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v3.0.3-darwin-amd64.tar.gz";
sha256 = "0d578hqkhwlhx50k9qpw7ixjyy1p2fd6cywj86s870jzgl8zh4fv"; sha256 = "1b4y5apgkd2k9yfx3f7p0vs5l0gqhgccbszgnzqq465i0970b6r7";
} }
{ {
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v3.3.0-darwin-amd64.tar.gz"; url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v3.4.1-darwin-amd64.tar.gz";
sha256 = "1qkh8hg7nplv0slq2xark57l547z63fy1l6zvrcblrqsqfw5zybv"; sha256 = "1q00jmjprhnxgvjc4a50jdgd90zj71ymfhkl1w1bkqlrva9spiws";
} }
{ {
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v2.11.4-darwin-amd64.tar.gz"; url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v2.12.2-darwin-amd64.tar.gz";
sha256 = "11c1d1jw0z4ybwvqfvmjcx3gkpwnvi5vcq01bc7a2wg374mkhj62"; sha256 = "0wpqk93ns9z3yvpas9aix345jm38hffssnz1dn5cxl6y0d5scjd8";
} }
]; ];
}; };

63
pkgs/tools/admin/pulumi/update.sh
View File

@ -3,31 +3,31 @@
# Version of Pulumi from # Version of Pulumi from
# https://www.pulumi.com/docs/get-started/install/versions/ # https://www.pulumi.com/docs/get-started/install/versions/
VERSION="2.19.0" VERSION="2.21.2"
# Grab latest release ${VERSION} from # Grab latest release ${VERSION} from
# https://github.com/pulumi/pulumi-${NAME}/releases # https://github.com/pulumi/pulumi-${NAME}/releases
plugins=( plugins=(
"auth0=1.5.2" "auth0=1.8.1"
"aws=3.25.1" "aws=3.30.1"
"cloudflare=2.11.1" "cloudflare=2.13.1"
"consul=2.7.0" "consul=2.8.1"
"datadog=2.15.0" "datadog=2.16.1"
"digitalocean=3.3.0" "digitalocean=3.5.1"
"docker=2.7.0" "docker=2.8.1"
"gcp=4.9.0" "gcp=4.12.0"
"github=2.5.1" "github=3.2.0"
"gitlab=3.5.0" "gitlab=3.7.0"
"hcloud=0.5.1" "hcloud=0.6.2"
"kubernetes=2.7.8" "kubernetes=2.8.2"
"mailgun=2.3.2" "mailgun=2.4.1"
"mysql=2.3.3" "mysql=2.4.1"
"openstack=2.11.0" "openstack=2.15.0"
"packet=3.2.2" "packet=3.2.2"
"postgresql=2.5.3" "postgresql=2.7.2"
"random=3.0.1" "random=3.0.3"
"vault=3.3.0" "vault=3.4.1"
"vsphere=2.11.4" "vsphere=2.12.2"
) )
function genMainSrc() { function genMainSrc() {
@ -56,7 +56,8 @@ function genSrcs() {
done done
} }
cat <<EOF > data.nix {
cat <<EOF
# DO NOT EDIT! This file is generated automatically by update.sh # DO NOT EDIT! This file is generated automatically by update.sh
{ }: { }:
{ {
@ -64,14 +65,14 @@ cat <<EOF > data.nix
pulumiPkgs = { pulumiPkgs = {
x86_64-linux = [ x86_64-linux = [
EOF EOF
genMainSrc "linux" >> data.nix genMainSrc "linux"
genSrcs "linux" >> data.nix genSrcs "linux"
echo " ];" >> data.nix echo " ];"
echo " x86_64-darwin = ["
echo " x86_64-darwin = [" >> data.nix
genMainSrc "darwin" >> data.nix
genSrcs "darwin" >> data.nix
echo " ];" >> data.nix
echo " };" >> data.nix
echo "}" >> data.nix
genMainSrc "darwin"
genSrcs "darwin"
echo " ];"
echo " };"
echo "}"
} > data.nix

4
pkgs/tools/bootloaders/refind/default.nix
View File

@ -14,11 +14,11 @@ in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "refind"; pname = "refind";
version = "0.13.0"; version = "0.13.1";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/project/refind/${version}/${pname}-src-${version}.tar.gz"; url = "mirror://sourceforge/project/refind/${version}/${pname}-src-${version}.tar.gz";
sha256 = "0zivlcw1f3zwnrwvbhwq6gg781hh72g2bhc2cxcsb2zmg7q8in65"; sha256 = "1yjni0mr3rqrrk4ynwb8i0whpqhd56cck4mxd97qmxn7wbr826i9";
}; };
patches = [ patches = [

51
pkgs/tools/graphics/dmtx-utils/default.nix
View File

@ -1,30 +1,33 @@
{lib, stdenv, fetchurl, libdmtx, pkg-config, imagemagick}: { lib
let , stdenv
s = # Generated upstream information , fetchFromGitHub
rec { , autoreconfHook
baseName="dmtx-utils"; , pkg-config
version="0.7.4"; , libdmtx
name="${baseName}-${version}"; , imagemagick
hash="1di8ymlziy9856abd6rb72z0zqzmrff4r3vql0q9r5sk5ax4s417"; }:
url="mirror://sourceforge/project/libdmtx/libdmtx/0.7.4/dmtx-utils-0.7.4.tar.gz";
sha256="1di8ymlziy9856abd6rb72z0zqzmrff4r3vql0q9r5sk5ax4s417"; stdenv.mkDerivation rec {
}; pname = "dmtx-utils";
nativeBuildInputs = [ pkg-config ]; version = "0.7.6";
buildInputs = [
libdmtx imagemagick src = fetchFromGitHub {
]; owner = "dmtx";
in repo = "dmtx-utils";
stdenv.mkDerivation { rev = "v${version}";
inherit (s) name version; sha256 = "06m3qncqdlcnmw83n95yrx2alaq6bld320ax26z4ndnla41yk0p4";
inherit nativeBuildInputs buildInputs;
src = fetchurl {
inherit (s) url sha256;
}; };
nativeBuildInputs = [ autoreconfHook pkg-config ];
buildInputs = [ libdmtx imagemagick ];
meta = { meta = {
inherit (s) version;
description = "Data matrix command-line utilities"; description = "Data matrix command-line utilities";
license = lib.licenses.lgpl2 ; homepage = "https://github.com/dmtx/dmtx-utils";
maintainers = [lib.maintainers.raskin]; changelog = "https://github.com/dmtx/dmtx-utils/blob/v${version}/ChangeLog";
license = lib.licenses.lgpl2;
maintainers = [ lib.maintainers.raskin ];
platforms = lib.platforms.unix; platforms = lib.platforms.unix;
}; };
} }

4
pkgs/tools/graphics/dmtx-utils/default.upstream
View File

@ -1,4 +0,0 @@
url https://sourceforge.net/projects/libdmtx/files/libdmtx/
SF_version_dir
version_link 'dmtx-utils-.*[.]tar[.][a-z0-9]+/download$'
SF_redirect

4
pkgs/tools/graphics/ldgallery/default.nix
View File

@ -1,4 +1,4 @@
{ lib, pkgs, makeWrapper, haskellPackages, haskell, pandoc, imagemagick7 }: { lib, pkgs, makeWrapper, haskellPackages, haskell, pandoc, imagemagick }:
with lib; with lib;
with haskell.lib; with haskell.lib;
@ -29,7 +29,7 @@ justStaticExecutables (overrideCabal ldgallery-compiler (oldAttrs: {
# wrapper for runtime dependencies registration # wrapper for runtime dependencies registration
wrapProgram "$out/bin/ldgallery" \ wrapProgram "$out/bin/ldgallery" \
--prefix PATH : ${lib.makeBinPath [ imagemagick7 ]} --prefix PATH : ${lib.makeBinPath [ imagemagick ]}
# bash completion # bash completion
mkdir -p "$out/share/bash-completion/completions" mkdir -p "$out/share/bash-completion/completions"

4
pkgs/tools/graphics/pfstools/default.nix
View File

@ -1,5 +1,5 @@
{ lib, stdenv, mkDerivation, fetchurl, cmake, pkg-config, darwin { lib, stdenv, mkDerivation, fetchurl, cmake, pkg-config, darwin
, openexr, zlib, imagemagick, libGLU, libGL, freeglut, fftwFloat , openexr, zlib, imagemagick6, libGLU, libGL, freeglut, fftwFloat
, fftw, gsl, libexif, perl, opencv2, qtbase, netpbm , fftw, gsl, libexif, perl, opencv2, qtbase, netpbm
}: }:
@ -27,7 +27,7 @@ mkDerivation rec {
nativeBuildInputs = [ cmake pkg-config ]; nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ buildInputs = [
openexr zlib imagemagick fftwFloat openexr zlib imagemagick6 fftwFloat
fftw gsl libexif perl opencv2 qtbase netpbm fftw gsl libexif perl opencv2 qtbase netpbm
] ++ (if stdenv.isDarwin then (with darwin.apple_sdk.frameworks; [ ] ++ (if stdenv.isDarwin then (with darwin.apple_sdk.frameworks; [
OpenGL GLUT OpenGL GLUT

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

@ -286,6 +286,9 @@ mapAliases ({
icedtea8_web = adoptopenjdk-icedtea-web; # added 2019-08-21 icedtea8_web = adoptopenjdk-icedtea-web; # added 2019-08-21
icedtea_web = adoptopenjdk-icedtea-web; # added 2019-08-21 icedtea_web = adoptopenjdk-icedtea-web; # added 2019-08-21
idea = jetbrains; # added 2017-04-03 idea = jetbrains; # added 2017-04-03
imagemagick7_light = imagemagick_light; # added 2021-02-22
imagemagick7 = imagemagick; # added 2021-02-22
imagemagick7Big = imagemagickBig; # added 2021-02-22
inboxer = throw "inboxer has been removed as it is no longer maintained and no longer works as Google shut down the inbox service this package wrapped."; inboxer = throw "inboxer has been removed as it is no longer maintained and no longer works as Google shut down the inbox service this package wrapped.";
infiniband-diags = rdma-core; # added 2019-08-09 infiniband-diags = rdma-core; # added 2019-08-09
inotifyTools = inotify-tools; inotifyTools = inotify-tools;

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

@ -23069,7 +23069,7 @@ in
imagej = callPackage ../applications/graphics/imagej { }; imagej = callPackage ../applications/graphics/imagej { };
imagemagick_light = imagemagick.override { imagemagick6_light = imagemagick6.override {
bzip2 = null; bzip2 = null;
zlib = null; zlib = null;
libX11 = null; libX11 = null;
@ -23092,14 +23092,14 @@ in
libde265 = null; libde265 = null;
}; };
imagemagick = callPackage ../applications/graphics/ImageMagick { imagemagick6 = callPackage ../applications/graphics/ImageMagick/6.x.nix {
inherit (darwin.apple_sdk.frameworks) ApplicationServices; inherit (darwin.apple_sdk.frameworks) ApplicationServices;
ghostscript = null; ghostscript = null;
}; };
imagemagickBig = imagemagick.override { inherit ghostscript; }; imagemagick6Big = imagemagick6.override { inherit ghostscript; };
imagemagick7_light = lowPrio (imagemagick7.override { imagemagick_light = lowPrio (imagemagick.override {
bzip2 = null; bzip2 = null;
zlib = null; zlib = null;
libX11 = null; libX11 = null;
@ -23121,11 +23121,11 @@ in
libheif = null; libheif = null;
}); });
imagemagick7 = lowPrio (imagemagick7Big.override { imagemagick = lowPrio (imagemagickBig.override {
ghostscript = null; ghostscript = null;
}); });
imagemagick7Big = lowPrio (callPackage ../applications/graphics/ImageMagick/7.0.nix { imagemagickBig = lowPrio (callPackage ../applications/graphics/ImageMagick/7.0.nix {
inherit (darwin.apple_sdk.frameworks) ApplicationServices; inherit (darwin.apple_sdk.frameworks) ApplicationServices;
}); });

13
pkgs/top-level/perl-packages.nix
View File

@ -9142,6 +9142,10 @@ let
}; };
buildInputs = [ pkgs.gtk3 ]; buildInputs = [ pkgs.gtk3 ];
propagatedBuildInputs = [ Readonly Gtk3 ]; propagatedBuildInputs = [ Readonly Gtk3 ];
# Tests are broken with PerlMagick and imagemagick version 7 as of 2021-02-22.
# See https://github.com/carygravel/gtk3-imageview/issues/19 and
# https://github.com/NixOS/nixpkgs/pull/114007#issuecomment-783595659.
doCheck = false;
checkInputs = [ TestDifferences PerlMagick TryTiny TestMockObject CarpAlways pkgs.librsvg ]; checkInputs = [ TestDifferences PerlMagick TryTiny TestMockObject CarpAlways pkgs.librsvg ];
checkPhase = '' checkPhase = ''
${pkgs.xvfb_run}/bin/xvfb-run -s '-screen 0 800x600x24' \ ${pkgs.xvfb_run}/bin/xvfb-run -s '-screen 0 800x600x24' \
@ -16739,19 +16743,18 @@ let
}; };
}; };
PerlMagick = buildPerlPackage { PerlMagick = buildPerlPackage rec {
pname = "PerlMagick"; pname = "PerlMagick";
version = "6.89-1"; version = "7.0.10";
src = fetchurl { src = fetchurl {
url = "mirror://cpan/authors/id/J/JC/JCRISTY/PerlMagick-6.89-1.tar.gz"; url = "mirror://cpan/authors/id/J/JC/JCRISTY/PerlMagick-${version}.tar.gz";
sha256 = "0n9afy1z5bhf9phrbahnkwhgcmijn8jggpbzwrivw1zhliliiy68"; sha256 = "1x05hdb3b6qs36x958b4w46qanvkqm6rpc44rlq4rd2w3gbp4lhx";
}; };
buildInputs = [ pkgs.imagemagick ]; buildInputs = [ pkgs.imagemagick ];
preConfigure = preConfigure =
'' ''
sed -i -e 's|my \$INC_magick = .*|my $INC_magick = "-I${pkgs.imagemagick.dev}/include/ImageMagick";|' Makefile.PL sed -i -e 's|my \$INC_magick = .*|my $INC_magick = "-I${pkgs.imagemagick.dev}/include/ImageMagick";|' Makefile.PL
''; '';
doCheck = false;
}; };
PerlTidy = buildPerlPackage rec { PerlTidy = buildPerlPackage rec {

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

@ -29,7 +29,7 @@ lib.makeScope pkgs.newScope (self: with self; {
composer = callPackage ../development/php-packages/composer { }; composer = callPackage ../development/php-packages/composer { };
composer2 = callPackage ../development/php-packages/composer/2.0.nix { }; composer1 = callPackage ../development/php-packages/composer/1.x.nix { };
php-cs-fixer = callPackage ../development/php-packages/php-cs-fixer { }; php-cs-fixer = callPackage ../development/php-packages/php-cs-fixer { };

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

@ -2808,6 +2808,8 @@ in {
graph-tool = callPackage ../development/python-modules/graph-tool/2.x.x.nix { inherit (pkgs) pkg-config; }; graph-tool = callPackage ../development/python-modules/graph-tool/2.x.x.nix { inherit (pkgs) pkg-config; };
graphtage = callPackage ../development/python-modules/graphtage { };
graphviz = callPackage ../development/python-modules/graphviz { inherit (pkgs) graphviz; }; graphviz = callPackage ../development/python-modules/graphviz { inherit (pkgs) graphviz; };
grappelli_safe = callPackage ../development/python-modules/grappelli_safe { }; grappelli_safe = callPackage ../development/python-modules/grappelli_safe { };
@ -3377,6 +3379,8 @@ in {
jsmin = callPackage ../development/python-modules/jsmin { }; jsmin = callPackage ../development/python-modules/jsmin { };
json5 = callPackage ../development/python-modules/json5 { };
jsondate = callPackage ../development/python-modules/jsondate { }; jsondate = callPackage ../development/python-modules/jsondate { };
jsondiff = callPackage ../development/python-modules/jsondiff { }; jsondiff = callPackage ../development/python-modules/jsondiff { };
@ -5325,6 +5329,8 @@ in {
pycdio = callPackage ../development/python-modules/pycdio { }; pycdio = callPackage ../development/python-modules/pycdio { };
pycec = callPackage ../development/python-modules/pycec { };
pycfdns = callPackage ../development/python-modules/pycfdns { }; pycfdns = callPackage ../development/python-modules/pycfdns { };
pychannels = callPackage ../development/python-modules/pychannels { }; pychannels = callPackage ../development/python-modules/pychannels { };
@ -6095,6 +6101,8 @@ in {
inherit (pkgs) bash subversion apr aprutil expat neon openssl; inherit (pkgs) bash subversion apr aprutil expat neon openssl;
}; };
pyswitchbot = callPackage ../development/python-modules/pyswitchbot { };
pysychonaut = callPackage ../development/python-modules/pysychonaut { }; pysychonaut = callPackage ../development/python-modules/pysychonaut { };
pysyncobj = callPackage ../development/python-modules/pysyncobj { }; pysyncobj = callPackage ../development/python-modules/pysyncobj { };
@ -6313,6 +6321,8 @@ in {
python3-openid = callPackage ../development/python-modules/python3-openid { }; python3-openid = callPackage ../development/python-modules/python3-openid { };
python-awair = callPackage ../development/python-modules/python-awair { };
python-axolotl = callPackage ../development/python-modules/python-axolotl { }; python-axolotl = callPackage ../development/python-modules/python-axolotl { };
python-axolotl-curve25519 = callPackage ../development/python-modules/python-axolotl-curve25519 { }; python-axolotl-curve25519 = callPackage ../development/python-modules/python-axolotl-curve25519 { };
@ -7288,6 +7298,8 @@ in {
simplegeneric = callPackage ../development/python-modules/simplegeneric { }; simplegeneric = callPackage ../development/python-modules/simplegeneric { };
simplehound = callPackage ../development/python-modules/simplehound { };
simplejson = callPackage ../development/python-modules/simplejson { }; simplejson = callPackage ../development/python-modules/simplejson { };
simplekml = callPackage ../development/python-modules/simplekml { }; simplekml = callPackage ../development/python-modules/simplekml { };
@ -8041,6 +8053,8 @@ in {
twine = callPackage ../development/python-modules/twine { }; twine = callPackage ../development/python-modules/twine { };
twinkly-client = callPackage ../development/python-modules/twinkly-client { };
twisted = callPackage ../development/python-modules/twisted { }; twisted = callPackage ../development/python-modules/twisted { };
twitch-python = callPackage ../development/python-modules/twitch-python { }; twitch-python = callPackage ../development/python-modules/twitch-python { };