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

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2022-03-11 18:01:20 +00:00 committed by GitHub
commit 7573d7fe79
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
50 changed files with 907 additions and 507 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/modules.nix
View File

@ -761,13 +761,13 @@ rec {
options = opt.options or
(throw "Option `${showOption loc}' has type optionSet but has no option attribute, in ${showFiles opt.declarations}.");
f = tp:
let optionSetIn = type: (tp.name == type) && (tp.functor.wrapped.name == "optionSet");
in
if tp.name == "option set" || tp.name == "submodule" then
throw "The option ${showOption loc} uses submodules without a wrapping type, in ${showFiles opt.declarations}."
else if optionSetIn "attrsOf" then types.attrsOf (types.submodule options)
else if optionSetIn "listOf" then types.listOf (types.submodule options)
else if optionSetIn "nullOr" then types.nullOr (types.submodule options)
else if (tp.functor.wrapped.name or null) == "optionSet" then
if tp.name == "attrsOf" then types.attrsOf (types.submodule options)
else if tp.name == "listOf" then types.listOf (types.submodule options)
else if tp.name == "nullOr" then types.nullOr (types.submodule options)
else tp
else tp;
in
if opt.type.getSubModules or null == null

2
maintainers/scripts/haskell/regenerate-hackage-packages.sh
View File

@ -20,7 +20,7 @@ HACKAGE2NIX="${HACKAGE2NIX:-hackage2nix}"
# See: https://github.com/NixOS/nixpkgs/pull/122023
export LC_ALL=C.UTF-8
extraction_derivation='with import ./. {}; runCommand "unpacked-cabal-hashes" { } "tar xf ${all-cabal-hashes} --strip-components=1 --one-top-level=$out"'
extraction_derivation='with import ./. {}; runCommandLocal "unpacked-cabal-hashes" { } "tar xf ${all-cabal-hashes} --strip-components=1 --one-top-level=$out"'
unpacked_hackage="$(nix-build -E "$extraction_derivation" --no-out-link)"
config_dir=pkgs/development/haskell-modules/configuration-hackage2nix

4
pkgs/applications/audio/roomeqwizard/default.nix
View File

@ -14,11 +14,11 @@
stdenv.mkDerivation rec {
pname = "roomeqwizard";
version = "5.20.4";
version = "5.20.5";
src = fetchurl {
url = "https://www.roomeqwizard.com/installers/REW_linux_${lib.replaceChars [ "." ] [ "_" ] version}.sh";
sha256 = "0m2b5hwazy4vyjk51cmayys250rircs3c0v7bv5mn28h7hyq29s8";
sha256 = "NYTRiOZmwkni4k+jI2SV84z5umO7+l+eKpwPCdlDD3U=";
};
dontUnpack = true;

800
pkgs/applications/editors/vim/plugins/generated.nix
View File

File diff suppressed because it is too large Load Diff

21
pkgs/applications/editors/vim/plugins/overrides.nix
View File

@ -39,6 +39,7 @@
, which
, xkb-switch
, ycmd
, zoxide
, nodejs
# test dependencies
@ -693,6 +694,17 @@ self: super: {
dependencies = with self; [ telescope-nvim ];
});
telescope-zoxide = super.telescope-zoxide.overrideAttrs (old: {
dependencies = with self; [ telescope-nvim ];
buildInputs = [ zoxide ];
postPatch = ''
substituteInPlace lua/telescope/_extensions/zoxide/config.lua \
--replace "zoxide query -ls" "${zoxide}/bin/zoxide query -ls"
'';
});
tup =
let
# Based on the comment at the top of https://github.com/gittup/tup/blob/master/contrib/syntax/tup.vim
@ -1076,6 +1088,15 @@ self: super: {
};
});
zoxide-vim = super.zoxide-vim.overrideAttrs (old: {
buildInputs = [ zoxide ];
postPatch = ''
substituteInPlace autoload/zoxide.vim \
--replace "'zoxide_executable', 'zoxide'" "'zoxide_executable', '${zoxide}/bin/zoxide'"
'';
});
} // (
let
nodePackageNames = [

2
pkgs/applications/editors/vim/plugins/vim-plugin-names
View File

@ -347,6 +347,7 @@ justincampbell/vim-eighties
justinj/vim-pico8-syntax
justinmk/vim-dirvish
justinmk/vim-sneak
jvgrootveld/telescope-zoxide
jvirtanen/vim-hcl
jvoorhis/coq.vim
KabbAmine/vCoolor.vim
@ -520,6 +521,7 @@ mzlogin/vim-markdown-toc
mzlogin/vim-smali
nacro90/numb.nvim
nanotech/jellybeans.vim
nanotee/zoxide.vim
natebosch/vim-lsc
nathanaelkane/vim-indent-guides
nathangrigg/vim-beancount

10
pkgs/applications/misc/audio/sox/default.nix
View File

@ -41,12 +41,16 @@ stdenv.mkDerivation rec {
src = fetchzip {
url = "https://sourceforge.net/code-snapshots/git/s/so/sox/code.git/sox-code-42b3557e13e0fe01a83465b672d89faddbe65f49.zip";
sha256 = "15rp55vr0h2954zl1rllsnriv64qab8fzsp0aprnpx1s5b14xjpm";
hash = "sha256-9cpOwio69GvzVeDq79BSmJgds9WU5kA/KUlAkHcpN5c=";
};
nativeBuildInputs = [ autoreconfHook autoconf-archive ]
nativeBuildInputs = [
autoreconfHook
autoconf-archive
] ++ lib.optional enableOpusfile [
# configure.ac uses pkg-config only to locate libopusfile
++ lib.optional enableOpusfile pkg-config;
pkg-config
];
patches = [ ./0001-musl-rewind-pipe-workaround.patch ];

17
pkgs/applications/networking/ipfs-cluster/default.nix
View File

@ -1,18 +1,27 @@
{ lib, buildGoModule, fetchFromGitHub }:
{ lib, buildGoModule, fetchFromGitHub, fetchpatch }:
buildGoModule rec {
pname = "ipfs-cluster";
version = "0.14.4";
version = "0.14.5";
vendorSha256 = "sha256-4j6aPs17YNXyPIRr5NshAPYIfNM08GlYV13jnGtJzQc=";
vendorSha256 = "sha256-ykUjq7Svp3+kUNnFkwsBlC+C4nws6Yvu3bk2Wb4c8vY=";
src = fetchFromGitHub {
owner = "ipfs";
repo = "ipfs-cluster";
rev = "v${version}";
sha256 = "sha256-82t3sHMKZiV6sYnW72N94qfRZ/aMkavj+hiAyg5viHQ=";
sha256 = "sha256-Xb7QbBmCJKgokxvdbtWxtnNIS/iUsYFLlRzgfoABAq8=";
};
# Remove patch when updating to >0.14.5
patches = [
(fetchpatch {
name = "remove-distribution-test.patch";
url = "https://github.com/ipfs/ipfs-cluster/pull/1589/commits/49825d1df76f848806f1d76abce5e279221cc8c5.patch";
sha256 = "sha256-mM2rc4ai/qhbvxnoRw5jO7BTRlD2/Tp037EuqqS49DE=";
})
];
meta = with lib; {
description = "Allocate, replicate, and track Pins across a cluster of IPFS daemons";
homepage = "https://cluster.ipfs.io/";

6
pkgs/applications/science/logic/abc/default.nix
View File

@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "abc-verifier";
version = "2021.11.12";
version = "2022.03.04";
src = fetchFromGitHub {
owner = "yosyshq";
repo = "abc";
rev = "f6fa2ddcfc89099726d60386befba874c7ac1e0d";
hash = "sha256-0rvMPZ+kL0m/GjlCLx3eXYQ0osQ2wQiS3+csqPl3U9s=";
rev = "d7ecb23eeee9c9b4924182ce570c2e33eb18abff";
hash = "sha256-aufWRTggJNOaUFsjh5+HFDqEur+nuM0hZSsTfGptbks=";
};
nativeBuildInputs = [ cmake ];

4
pkgs/applications/version-management/mercurial/default.nix
View File

@ -181,6 +181,10 @@ in
nativeBuildInputs = self.nativeBuildInputs;
dontUnpack = true;
dontPatch = true;
dontConfigure = true;
dontBuild = true;
doCheck = false;
installPhase = ''
runHook preInstall

3
pkgs/build-support/dotnet/build-dotnet-module/default.nix
View File

@ -102,9 +102,6 @@ in stdenvNoCC.mkDerivation (args // {
# gappsWrapperArgs gets included when wrapping for dotnet, as to avoid double wrapping
dontWrapGApps = args.dontWrapGApps or true;
DOTNET_NOLOGO = args.DOTNET_NOLOGO or true; # This disables the welcome message.
DOTNET_CLI_TELEMETRY_OPTOUT = args.DOTNET_CLI_TELEMETRY_OPTOUT or true;
passthru = {
fetch-deps = writeScript "fetch-${pname}-deps" ''
set -euo pipefail

2
pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-configure-hook.sh
View File

@ -9,8 +9,6 @@ dotnetConfigureHook() {
parallelFlag="--disable-parallel"
fi
export HOME=$(mktemp -d)
for project in ${projectFile[@]} ${testProjectFile[@]}; do
env \
dotnet restore "$project" \

9
pkgs/development/compilers/dotnet/build-dotnet.nix
View File

@ -4,9 +4,11 @@
}:
assert builtins.elem type [ "aspnetcore" "runtime" "sdk"];
{ lib
, stdenv
, fetchurl
, writeText
, libunwind
, openssl
, icu
@ -87,6 +89,13 @@ in stdenv.mkDerivation rec {
$out/bin/dotnet --info
'';
setupHook = writeText "dotnet-setup-hook" ''
export HOME=$(mktemp -d) # Dotnet expects a writable home directory for its configuration files
export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 # Dont try to expand NuGetFallbackFolder to disk
export DOTNET_NOLOGO=1 # Disables the welcome message
export DOTNET_CLI_TELEMETRY_OPTOUT=1
'';
meta = with lib; {
homepage = "https://dotnet.github.io/";
description = builtins.getAttr type descriptions;

17
pkgs/development/compilers/reason/default.nix
View File

@ -1,19 +1,14 @@
{ lib, callPackage, stdenv, makeWrapper, fetchFromGitHub, ocaml, findlib, dune_2
{ lib, callPackage, stdenv, makeWrapper, fetchurl, ocaml, findlib, dune_2
, fix, menhir, menhirLib, menhirSdk, merlin-extend, ppxlib, utop, cppo, ppx_derivers
}:
lib.throwIfNot (lib.versionOlder ocaml.version "4.13")
"reason is not available for OCaml ${ocaml.version}"
stdenv.mkDerivation rec {
pname = "ocaml${ocaml.version}-reason";
version = "3.7.0";
version = "3.8.0";
src = fetchFromGitHub {
owner = "facebook";
repo = "reason";
rev = "daa11255cb4716ce1c370925251021bd6e3bd974";
sha256 = "0m6ldrci1a4j0qv1cbwh770zni3al8qxsphl353rv19f6rblplhs";
src = fetchurl {
url = "https://github.com/reasonml/reason/releases/download/${version}/reason-${version}.tbz";
sha256 = "sha256:0yc94m3ddk599crg33yxvkphxpy54kmdsl599c320wvn055p4y4l";
};
nativeBuildInputs = [
@ -42,11 +37,13 @@ stdenv.mkDerivation rec {
buildFlags = [ "build" ]; # do not "make tests" before reason lib is installed
installPhase = ''
runHook preInstall
dune install --prefix=$out --libdir=$OCAMLFIND_DESTDIR
wrapProgram $out/bin/rtop \
--prefix PATH : "${utop}/bin" \
--prefix CAML_LD_LIBRARY_PATH : "$CAML_LD_LIBRARY_PATH" \
--prefix OCAMLPATH : "$OCAMLPATH:$OCAMLFIND_DESTDIR"
runHook postInstall
'';
passthru.tests = {

8
pkgs/development/compilers/yosys/default.nix
View File

@ -72,13 +72,13 @@ let
in stdenv.mkDerivation rec {
pname = "yosys";
version = "0.12+54";
version = "0.15";
src = fetchFromGitHub {
owner = "YosysHQ";
repo = "yosys";
rev = "59a71503448401d2476cf0872808e0a99c3a4d81";
hash = "sha256-cz4PQymaA9UW91lN+6iniFhbcPRpFNIAeC8ZkwYeg0U=";
rev = "${pname}-${version}";
hash = "sha256-1NCcsq0otVKTTSSmnX2kCvvngF1yzqYWlRVzu+XY65w=";
};
enableParallelBuilding = true;
@ -143,7 +143,7 @@ in stdenv.mkDerivation rec {
meta = with lib; {
description = "Open RTL synthesis framework and tools";
homepage = "http://www.clifford.at/yosys/";
homepage = "https://yosyshq.net/yosys/";
license = licenses.isc;
platforms = platforms.all;
maintainers = with maintainers; [ shell thoughtpolice emily ];

1
pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
View File

@ -5199,7 +5199,6 @@ broken-packages:
- unfix-binders
- unfoldable
- unicode-prelude
- unicode-show
- unicode-symbols
- unicode-tricks
- uniform-fileio

2
pkgs/development/haskell-modules/hackage-packages.nix generated
View File

@ -286292,8 +286292,6 @@ self: {
testHaskellDepends = [ base hspec QuickCheck ];
description = "print and show in unicode";
license = lib.licenses.bsd3;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
"unicode-symbols" = callPackage

20
pkgs/development/libraries/re2/default.nix
View File

@ -1,25 +1,16 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch, nix-update-script }:
{ lib, stdenv, fetchFromGitHub, nix-update-script }:
stdenv.mkDerivation rec {
pname = "re2";
version = "2021-11-01";
version = "2022-02-01";
src = fetchFromGitHub {
owner = "google";
repo = "re2";
rev = version;
sha256 = "sha256-q8u7xNp6n17F6twPoVkix8iCKPWUN+qg6rhSR4Dv+bI=";
sha256 = "sha256-3RspCfJD2jV7GYuzeBUcxkZsdHyL14kaz8lSoIrH7b8=";
};
patches = [
# Pull upstreal fix for parallel testing.
(fetchpatch {
name = "parallel-tests.patch";
url = "https://github.com/google/re2/commit/9262284a7edc1b83e7172f4ec2d7967d695e7420.patch";
sha256 = "1knhfx9cs4841r09jw4ha6mdx9qwpvlcxvd04i8vr84kd0lilqms";
})
];
preConfigure = ''
substituteInPlace Makefile --replace "/usr/local" "$out"
# we're using gnu sed, even on darwin
@ -29,6 +20,11 @@ stdenv.mkDerivation rec {
buildFlags = lib.optionals stdenv.hostPlatform.isStatic [ "static" ];
enableParallelBuilding = true;
# Broken when shared/static are tested in parallel:
# cp: cannot create regular file 'obj/testinstall.cc': File exists
# make: *** [Makefile:334: static-testinstall] Error 1
# Will be fixed by https://code-review.googlesource.com/c/re2/+/59830
enableParallelChecking = false;
preCheck = "patchShebangs runtests";
doCheck = true;

4
pkgs/development/libraries/science/math/petsc/default.nix
View File

@ -18,11 +18,11 @@ assert petsc-withp4est -> p4est.mpiSupport;
stdenv.mkDerivation rec {
pname = "petsc";
version = "3.16.4";
version = "3.16.5";
src = fetchurl {
url = "http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/petsc-${version}.tar.gz";
sha256 = "sha256-IpzOIr3P7bH+gn0wbtGvypc3eGzcPwVit0oZZsEkPK8=";
sha256 = "sha256-fehXDuuUBidS2CqDII/Cuvx3s/UVAjpMFNj/lEDmbKw=";
};
mpiSupport = !withp4est || p4est.mpiSupport;

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

@ -13,10 +13,10 @@ assert stdenv.isDarwin -> Carbon != null;
stdenv.mkDerivation rec {
pname = "tachyon";
version = "0.99b6";
version = "0.99.3";
src = fetchurl {
url = "http://jedi.ks.uiuc.edu/~johns/tachyon/files/${version}/${pname}-${version}.tar.gz";
sha256 = "15wv2748ngk2iid798a774sjxhhijq7kjm32yl897x54fsfazp7l";
sha256 = "sha256-rsxxm1NK2IPRl/5O2Ng2sC1VH84Zj1uJ6mN+HZHyN+E=";
};
buildInputs = lib.optionals stdenv.isDarwin [
Carbon

4
pkgs/development/libraries/tracker-miners/default.nix
View File

@ -47,11 +47,11 @@
stdenv.mkDerivation rec {
pname = "tracker-miners";
version = "3.2.1";
version = "3.2.2";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "RDafU+Lt70FDdAbb7s1Hepf4qa/dkTSDLqRdG6KqLEc=";
sha256 = "/YTHHmIbwrgcrLX5CJMkNiRtG4pPw6Y1PiuNuuvAI2w=";
};
nativeBuildInputs = [

29
pkgs/development/lisp-modules/quicklisp-to-nix-output/flow.nix Normal file
View File

@ -0,0 +1,29 @@
/* Generated file. */
args @ { fetchurl, ... }:
rec {
baseName = "flow";
version = "20200610-git";
description = "A flowchart and generalised graph library.";
deps = [ args."closer-mop" args."documentation-utils" args."trivial-indent" ];
src = fetchurl {
url = "http://beta.quicklisp.org/archive/flow/2020-06-10/flow-20200610-git.tgz";
sha256 = "1z1krk1iiz7n1mvpnmqnrgfhicpppb45i0jgkqnrds749xjnx194";
};
packageName = "flow";
asdFilesToKeep = ["flow.asd"];
overrides = x: x;
}
/* (SYSTEM flow DESCRIPTION A flowchart and generalised graph library. SHA256
1z1krk1iiz7n1mvpnmqnrgfhicpppb45i0jgkqnrds749xjnx194 URL
http://beta.quicklisp.org/archive/flow/2020-06-10/flow-20200610-git.tgz MD5
f0767467d5e9bfda6fe5777a26719811 NAME flow FILENAME flow DEPS
((NAME closer-mop FILENAME closer-mop)
(NAME documentation-utils FILENAME documentation-utils)
(NAME trivial-indent FILENAME trivial-indent))
DEPENDENCIES (closer-mop documentation-utils trivial-indent) VERSION
20200610-git SIBLINGS (flow-visualizer) PARASITES NIL) */

27
pkgs/development/lisp-modules/quicklisp-to-nix-output/lambda-fiddle.nix Normal file
View File

@ -0,0 +1,27 @@
/* Generated file. */
args @ { fetchurl, ... }:
rec {
baseName = "lambda-fiddle";
version = "20190710-git";
description = "A collection of functions to process lambda-lists.";
deps = [ ];
src = fetchurl {
url = "http://beta.quicklisp.org/archive/lambda-fiddle/2019-07-10/lambda-fiddle-20190710-git.tgz";
sha256 = "0v4qjpp9fq9rlxhr5f6mjs5f076xrjk19rl6qgp1ap1ykcrx8k4j";
};
packageName = "lambda-fiddle";
asdFilesToKeep = ["lambda-fiddle.asd"];
overrides = x: x;
}
/* (SYSTEM lambda-fiddle DESCRIPTION
A collection of functions to process lambda-lists. SHA256
0v4qjpp9fq9rlxhr5f6mjs5f076xrjk19rl6qgp1ap1ykcrx8k4j URL
http://beta.quicklisp.org/archive/lambda-fiddle/2019-07-10/lambda-fiddle-20190710-git.tgz
MD5 78f68f144ace9cb8f634ac14b3414e5e NAME lambda-fiddle FILENAME
lambda-fiddle DEPS NIL DEPENDENCIES NIL VERSION 20190710-git SIBLINGS NIL
PARASITES NIL) */

35
pkgs/development/lisp-modules/quicklisp-to-nix-output/legit.nix Normal file
View File

@ -0,0 +1,35 @@
/* Generated file. */
args @ { fetchurl, ... }:
rec {
baseName = "legit";
version = "20190710-git";
description = "CL interface to the GIT binary.";
deps = [ args."alexandria" args."bordeaux-threads" args."cl-ppcre" args."documentation-utils" args."lambda-fiddle" args."simple-inferiors" args."trivial-indent" args."uiop" ];
src = fetchurl {
url = "http://beta.quicklisp.org/archive/legit/2019-07-10/legit-20190710-git.tgz";
sha256 = "0g7cn50qvivsn0w9yszqw2qh22jsj60067pmg5pvwsjm03xdl9s9";
};
packageName = "legit";
asdFilesToKeep = ["legit.asd"];
overrides = x: x;
}
/* (SYSTEM legit DESCRIPTION CL interface to the GIT binary. SHA256
0g7cn50qvivsn0w9yszqw2qh22jsj60067pmg5pvwsjm03xdl9s9 URL
http://beta.quicklisp.org/archive/legit/2019-07-10/legit-20190710-git.tgz
MD5 9b380fc23d4bab086df8a0e4a598457a NAME legit FILENAME legit DEPS
((NAME alexandria FILENAME alexandria)
(NAME bordeaux-threads FILENAME bordeaux-threads)
(NAME cl-ppcre FILENAME cl-ppcre)
(NAME documentation-utils FILENAME documentation-utils)
(NAME lambda-fiddle FILENAME lambda-fiddle)
(NAME simple-inferiors FILENAME simple-inferiors)
(NAME trivial-indent FILENAME trivial-indent) (NAME uiop FILENAME uiop))
DEPENDENCIES
(alexandria bordeaux-threads cl-ppcre documentation-utils lambda-fiddle
simple-inferiors trivial-indent uiop)
VERSION 20190710-git SIBLINGS NIL PARASITES NIL) */

33
pkgs/development/lisp-modules/quicklisp-to-nix-output/nbd.nix Normal file
View File

@ -0,0 +1,33 @@
/* Generated file. */
args @ { fetchurl, ... }:
rec {
baseName = "nbd";
version = "20200925-git";
parasites = [ "nbd/simple-in-memory" ];
description = "Network Block Device server library.";
deps = [ args."bordeaux-threads" args."flexi-streams" args."lisp-binary" args."wild-package-inferred-system" ];
src = fetchurl {
url = "http://beta.quicklisp.org/archive/nbd/2020-09-25/nbd-20200925-git.tgz";
sha256 = "1npq9a8l3mn67n22ywqm8wh6kr9xv9djla2yj2m535gkysrlvnky";
};
packageName = "nbd";
asdFilesToKeep = ["nbd.asd"];
overrides = x: x;
}
/* (SYSTEM nbd DESCRIPTION Network Block Device server library. SHA256
1npq9a8l3mn67n22ywqm8wh6kr9xv9djla2yj2m535gkysrlvnky URL
http://beta.quicklisp.org/archive/nbd/2020-09-25/nbd-20200925-git.tgz MD5
f32b7a508ac87c1e179c259b171dc837 NAME nbd FILENAME nbd DEPS
((NAME bordeaux-threads FILENAME bordeaux-threads)
(NAME flexi-streams FILENAME flexi-streams)
(NAME lisp-binary FILENAME lisp-binary)
(NAME wild-package-inferred-system FILENAME wild-package-inferred-system))
DEPENDENCIES
(bordeaux-threads flexi-streams lisp-binary wild-package-inferred-system)
VERSION 20200925-git SIBLINGS NIL PARASITES (nbd/simple-in-memory)) */

33
pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-inferiors.nix Normal file
View File

@ -0,0 +1,33 @@
/* Generated file. */
args @ { fetchurl, ... }:
rec {
baseName = "simple-inferiors";
version = "20200325-git";
description = "A very simple library to use inferior processes.";
deps = [ args."alexandria" args."bordeaux-threads" args."documentation-utils" args."trivial-indent" args."uiop" ];
src = fetchurl {
url = "http://beta.quicklisp.org/archive/simple-inferiors/2020-03-25/simple-inferiors-20200325-git.tgz";
sha256 = "15gjizqrazr0ahdda2l6bkv7ii5ax1wckn9mnj5haiv17jba8pn5";
};
packageName = "simple-inferiors";
asdFilesToKeep = ["simple-inferiors.asd"];
overrides = x: x;
}
/* (SYSTEM simple-inferiors DESCRIPTION
A very simple library to use inferior processes. SHA256
15gjizqrazr0ahdda2l6bkv7ii5ax1wckn9mnj5haiv17jba8pn5 URL
http://beta.quicklisp.org/archive/simple-inferiors/2020-03-25/simple-inferiors-20200325-git.tgz
MD5 f90ae807c10d5b3c4b9eef1134a537c8 NAME simple-inferiors FILENAME
simple-inferiors DEPS
((NAME alexandria FILENAME alexandria)
(NAME bordeaux-threads FILENAME bordeaux-threads)
(NAME documentation-utils FILENAME documentation-utils)
(NAME trivial-indent FILENAME trivial-indent) (NAME uiop FILENAME uiop))
DEPENDENCIES
(alexandria bordeaux-threads documentation-utils trivial-indent uiop)
VERSION 20200325-git SIBLINGS NIL PARASITES NIL) */

30
pkgs/development/lisp-modules/quicklisp-to-nix-output/wild-package-inferred-system.nix Normal file
View File

@ -0,0 +1,30 @@
/* Generated file. */
args @ { fetchurl, ... }:
rec {
baseName = "wild-package-inferred-system";
version = "20200325-git";
parasites = [ "wild-package-inferred-system/test" ];
description = "Introduces the wildcards `*' and `**' into package-inferred-system";
deps = [ args."fiveam" ];
src = fetchurl {
url = "http://beta.quicklisp.org/archive/wild-package-inferred-system/2020-03-25/wild-package-inferred-system-20200325-git.tgz";
sha256 = "1ypnpzy9z4zkna29sgl4afc386ksa61302bm5kznxb3zz2v1sjas";
};
packageName = "wild-package-inferred-system";
asdFilesToKeep = ["wild-package-inferred-system.asd"];
overrides = x: x;
}
/* (SYSTEM wild-package-inferred-system DESCRIPTION
Introduces the wildcards `*' and `**' into package-inferred-system SHA256
1ypnpzy9z4zkna29sgl4afc386ksa61302bm5kznxb3zz2v1sjas URL
http://beta.quicklisp.org/archive/wild-package-inferred-system/2020-03-25/wild-package-inferred-system-20200325-git.tgz
MD5 4dfd9f90d780b1e67640543dd4acbf21 NAME wild-package-inferred-system
FILENAME wild-package-inferred-system DEPS ((NAME fiveam FILENAME fiveam))
DEPENDENCIES (fiveam) VERSION 20200325-git SIBLINGS (foo-wild) PARASITES
(wild-package-inferred-system/test)) */

3
pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt
View File

@ -138,6 +138,7 @@ file-attributes
fiveam
flexi-streams
float-features
flow
form-fiddle
fset
generic-cl
@ -157,6 +158,7 @@ iterate
jonathan
jsown
lack
legit
let-plus
lev
lfarm-client
@ -183,6 +185,7 @@ moptilities
more-conditions
mt19937
named-readtables
nbd
net-telent-date
nibbles
optima

85
pkgs/development/lisp-modules/quicklisp-to-nix.nix
View File

@ -297,6 +297,15 @@ let quicklisp-to-nix-packages = rec {
}));
"wild-package-inferred-system" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."wild-package-inferred-system" or (x: {}))
(import ./quicklisp-to-nix-output/wild-package-inferred-system.nix {
inherit fetchurl;
"fiveam" = quicklisp-to-nix-packages."fiveam";
}));
"parseq" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."parseq" or (x: {}))
@ -369,6 +378,43 @@ let quicklisp-to-nix-packages = rec {
"usocket" = quicklisp-to-nix-packages."usocket";
}));
"simple-inferiors" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."simple-inferiors" or (x: {}))
(import ./quicklisp-to-nix-output/simple-inferiors.nix {
inherit fetchurl;
"alexandria" = quicklisp-to-nix-packages."alexandria";
"bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
"documentation-utils" = quicklisp-to-nix-packages."documentation-utils";
"trivial-indent" = quicklisp-to-nix-packages."trivial-indent";
"uiop" = quicklisp-to-nix-packages."uiop";
}));
"lambda-fiddle" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."lambda-fiddle" or (x: {}))
(import ./quicklisp-to-nix-output/lambda-fiddle.nix {
inherit fetchurl;
}));
"iolib_dot_grovel" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."iolib_dot_grovel" or (x: {}))
(import ./quicklisp-to-nix-output/iolib_dot_grovel.nix {
inherit fetchurl;
"alexandria" = quicklisp-to-nix-packages."alexandria";
"babel" = quicklisp-to-nix-packages."babel";
"cffi" = quicklisp-to-nix-packages."cffi";
"iolib_dot_asdf" = quicklisp-to-nix-packages."iolib_dot_asdf";
"iolib_dot_base" = quicklisp-to-nix-packages."iolib_dot_base";
"iolib_dot_common-lisp" = quicklisp-to-nix-packages."iolib_dot_common-lisp";
"iolib_dot_conf" = quicklisp-to-nix-packages."iolib_dot_conf";
"split-sequence" = quicklisp-to-nix-packages."split-sequence";
"trivial-features" = quicklisp-to-nix-packages."trivial-features";
"uiop" = quicklisp-to-nix-packages."uiop";
}));
"trivia_dot_quasiquote" = buildLispPackage
((f: x: (x // (f x)))
@ -2673,6 +2719,18 @@ let quicklisp-to-nix-packages = rec {
}));
"nbd" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."nbd" or (x: {}))
(import ./quicklisp-to-nix-output/nbd.nix {
inherit fetchurl;
"bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
"flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
"lisp-binary" = quicklisp-to-nix-packages."lisp-binary";
"wild-package-inferred-system" = quicklisp-to-nix-packages."wild-package-inferred-system";
}));
"named-readtables" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."named-readtables" or (x: {}))
@ -2971,6 +3029,22 @@ let quicklisp-to-nix-packages = rec {
}));
"legit" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."legit" or (x: {}))
(import ./quicklisp-to-nix-output/legit.nix {
inherit fetchurl;
"alexandria" = quicklisp-to-nix-packages."alexandria";
"bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
"cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
"documentation-utils" = quicklisp-to-nix-packages."documentation-utils";
"lambda-fiddle" = quicklisp-to-nix-packages."lambda-fiddle";
"simple-inferiors" = quicklisp-to-nix-packages."simple-inferiors";
"trivial-indent" = quicklisp-to-nix-packages."trivial-indent";
"uiop" = quicklisp-to-nix-packages."uiop";
}));
"lack" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."lack" or (x: {}))
@ -3307,6 +3381,17 @@ let quicklisp-to-nix-packages = rec {
}));
"flow" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."flow" or (x: {}))
(import ./quicklisp-to-nix-output/flow.nix {
inherit fetchurl;
"closer-mop" = quicklisp-to-nix-packages."closer-mop";
"documentation-utils" = quicklisp-to-nix-packages."documentation-utils";
"trivial-indent" = quicklisp-to-nix-packages."trivial-indent";
}));
"float-features" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."float-features" or (x: {}))

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

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "boschshcpy";
version = "0.2.29";
version = "0.2.30";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "tschamm";
repo = pname;
rev = version;
sha256 = "sha256-x+TXHG7xJWd5t6pKQ/6X48lOuIQWUnEwsySFRh5GJnE=";
sha256 = "sha256-qq01hnNiJ6BUGhi5owYvxM+Kj7/KYp0vBpILmwPuZaw=";
};
propagatedBuildInputs = [

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

@ -8,13 +8,13 @@
buildPythonPackage rec {
pname = "glcontext";
version = "2.3.4";
version = "2.3.5";
src = fetchFromGitHub {
owner = "moderngl";
repo = pname;
rev = version;
sha256 = "1m2zkl696vqmgrd5k1c5kl0krk6qgjgsz88qhahwva0l40bswvhp";
sha256 = "sha256-wvoIfwd0UBooqbJGshADjf96Xqx2k9G1nN3Dy6v3GIY=";
};
disabled = !isPy3k;

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

@ -20,7 +20,7 @@
buildPythonPackage rec {
pname = "gql";
version = "3.0.0";
version = "3.1.0";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -29,7 +29,7 @@ buildPythonPackage rec {
owner = "graphql-python";
repo = pname;
rev = "v${version}";
hash = "sha256-c2OVBOIwQlwyqET8Q22O65VtWduVzQjYOhkE8GpD6LQ=";
hash = "sha256-ZtrT+zeoP9KXdaCDKOUrjEwe7dN0+IwA20FDe5ja7l8=";
};
propagatedBuildInputs = [

28
pkgs/development/python-modules/iodata/default.nix Normal file
View File

@ -0,0 +1,28 @@
{ buildPythonPackage, lib, fetchFromGitHub, numpy, scipy, attrs, cython, nose }:
buildPythonPackage rec {
pname = "iodata";
version = "0.1.7";
src = fetchFromGitHub {
owner = "theochem";
repo = pname;
rev = version;
hash = "sha256-Qn2xWFxdS12K92DhdHVzYrBjPRV+vYo7Cs27vkeCaxM=";
};
leaveDotGit = true;
nativeBuildInputs = [ cython nose ];
propagatedBuildInputs = [ numpy scipy attrs ];
pythonImportsCheck = [ "iodata" "iodata.overlap_accel" ];
doCheck = false; # Requires roberto or nose and a lenghtly setup to find the cython modules
meta = with lib; {
description = "Python library for reading, writing, and converting computational chemistry file formats and generating input files";
homepage = "https://github.com/theochem/iodata";
license = licenses.lgpl3Only;
maintainers = [ maintainers.sheepforce ];
};
}

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

@ -13,12 +13,12 @@
buildPythonPackage rec {
pname = "pycurl";
version = "7.44.1";
version = "7.45.0";
disabled = isPyPy || (pythonOlder "3.5"); # https://github.com/pycurl/pycurl/issues/208
src = fetchPypi {
inherit pname version;
sha256 = "5bcef4d988b74b99653602101e17d8401338d596b9234d263c728a0c3df003e8";
sha256 = "sha256-UDbFPG9BBukWDQU6S6o0M6AhX7M4YHPiESc8VqOpXz0=";
};
preConfigure = ''

28
pkgs/development/python-modules/simber/default.nix
View File

@ -1,20 +1,36 @@
{ lib, buildPythonPackage, fetchFromGitHub, colorama, pytestCheckHook }:
{ lib
, buildPythonPackage
, fetchFromGitHub
, colorama
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
pname = "simber";
version = "0.2.3";
version = "0.2.4";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "deepjyoti30";
repo = pname;
rev = version;
sha256 = "04dp9b4s7zb166vlacsaypc6iw1p75azqas1wf0flp570qqf3rkx";
hash = "sha256-P4bhxu9Di4E2Zkd0vIkyDi1S6Y0V/EQSMF4ftWoiXKE=";
};
propagatedBuildInputs = [ colorama ];
propagatedBuildInputs = [
colorama
];
checkInputs = [ pytestCheckHook ];
pythonImportsCheck = [ "simber" ];
checkInputs = [
pytestCheckHook
];
pythonImportsCheck = [
"simber"
];
meta = with lib; {
description = "Simple, minimal and powerful logger for Python";

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

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "yamlfix";
version = "0.8.0";
version = "0.8.2";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "lyz-code";
repo = pname;
rev = version;
sha256 = "sha256-Gkq80YMeiPy7xxLauA/nloW4znMV2tfE+e24HyZgUaQ=";
sha256 = "sha256-YCC4xK1fB5Gyv32JhbSuejtzLNMRnH7iyUpzccVijS0=";
};
propagatedBuildInputs = [

4
pkgs/development/tools/analysis/checkov/default.nix
View File

@ -32,13 +32,13 @@ with py.pkgs;
buildPythonApplication rec {
pname = "checkov";
version = "2.0.931";
version = "2.0.936";
src = fetchFromGitHub {
owner = "bridgecrewio";
repo = pname;
rev = version;
hash = "sha256-y38oyQVHEi/bXcntxDU0AsOog6Sq/TPvF/NfJjybXiE=";
hash = "sha256-erpVJTnWUfoY4Ymdf7fZyri2NGAYs0NF+r3DMFFYURM=";
};
nativeBuildInputs = with py.pkgs; [

5
pkgs/development/tools/continuous-integration/github-runner/default.nix
View File

@ -102,11 +102,6 @@ stdenv.mkDerivation rec {
configurePhase = ''
runHook preConfigure
# Set up Nuget dependencies
export HOME=$(mktemp -d)
export DOTNET_CLI_TELEMETRY_OPTOUT=1
export DOTNET_NOLOGO=1
# Never use nuget.org
nuget sources Disable -Name "nuget.org"

8
pkgs/development/tools/faas-cli/default.nix
View File

@ -9,15 +9,13 @@ let
in
buildGoModule rec {
pname = "faas-cli";
# When updating version change rev.
version = "0.14.2";
rev = "b1c09c0243f69990b6c81a17d7337f0fd23e7542";
version = "0.14.3";
src = fetchFromGitHub {
owner = "openfaas";
repo = "faas-cli";
rev = version;
sha256 = "sha256-OdFd4q5IHu4FjNArcqVt4dNyLWegR4GdAyyCzgNIU+Q=";
sha256 = "sha256-1aflQXfW/y31Dk0OZW77qNQKEwkhi6p8ZBfTUyRDbdo=";
};
CGO_ENABLED = 0;
@ -28,7 +26,7 @@ buildGoModule rec {
ldflags = [
"-s" "-w"
"-X github.com/openfaas/faas-cli/version.GitCommit=${rev}"
"-X github.com/openfaas/faas-cli/version.GitCommit=ref/tags/${version}"
"-X github.com/openfaas/faas-cli/version.Version=${version}"
"-X github.com/openfaas/faas-cli/commands.Platform=${faasPlatform stdenv.targetPlatform}"
];

9
pkgs/development/tools/misc/netcoredbg/default.nix
View File

@ -24,14 +24,7 @@ let
unmanaged = clangStdenv.mkDerivation rec {
inherit src pname version;
nativeBuildInputs = [ cmake ];
# Building the "unmanaged part" still involves compiling C# code.
preBuild = ''
export HOME=$(mktemp -d)
export DOTNET_CLI_TELEMETRY_OPTOUT=1
export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
'';
nativeBuildInputs = [ cmake dotnet-sdk ];
hardeningDisable = [ "strictoverflow" ];

6
pkgs/os-specific/linux/firmware/linux-firmware/default.nix
View File

@ -2,12 +2,12 @@
stdenvNoCC.mkDerivation rec {
pname = "linux-firmware";
version = "20220209";
version = "20220310";
src = fetchgit {
url = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git";
rev = "refs/tags/${version}";
sha256 = "sha256-QWGnaGQrDUQeYUIBq0/63YdHZgyaF4s9fdyLA9bb6qs=";
sha256 = "sha256-U5XZHzriZaPlgiAcrZnAA7K8PKnIGy58Pi6JziVFTR8=";
};
installFlags = [ "DESTDIR=$(out)" ];
@ -17,7 +17,7 @@ stdenvNoCC.mkDerivation rec {
outputHashMode = "recursive";
outputHashAlgo = "sha256";
outputHash = "sha256-ahXZK13wrcZW/8ZCgUTHU6N4QKsL3NV98eRbYGBp3jw=";
outputHash = "sha256-CAYJssH36aKhzvl0q60HyxgDXeAluspfnLLmawmWIQw=";
meta = with lib; {
description = "Binary firmware collection packaged by kernel.org";

4
pkgs/os-specific/linux/kernel/linux-xanmod.nix
View File

@ -1,7 +1,7 @@
{ lib, stdenv, buildLinux, fetchFromGitHub, ... } @ args:
let
version = "5.15.24";
version = "5.15.27";
release = "1";
suffix = "xanmod${release}-tt";
in
@ -13,7 +13,7 @@ buildLinux (args // rec {
owner = "xanmod";
repo = "linux";
rev = modDirVersion;
sha256 = "sha256-O3OadPMBl74IK92w7IPGfiePeo/Ox+bIVr4XmOmPYTg=";
sha256 = "sha256-ycUvTXDKnffxs8FKZJurX2bDr85gMQlSIFD0nST2Q98=";
};
structuredExtraConfig = with lib.kernel; {

5
pkgs/servers/jellyfin/default.nix
View File

@ -70,11 +70,6 @@ stdenv.mkDerivation rec {
configurePhase = ''
runHook preConfigure
export HOME=$(mktemp -d)
export DOTNET_CLI_TELEMETRY_OPTOUT=1
export DOTNET_NOLOGO=1
nuget sources Add -Name nixos -Source "$PWD/nixos"
nuget init "$nugetDeps" "$PWD/nixos"

4
pkgs/servers/nosql/eventstore/default.nix
View File

@ -43,10 +43,6 @@ stdenv.mkDerivation rec {
'';
buildPhase = ''
mkdir home
export HOME=$PWD/home
export DOTNET_CLI_TELEMETRY_OPTOUT=1
export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
export FrameworkPathOverride=${mono}/lib/mono/4.7.1-api
# disable default-source so nuget does not try to download from online-repo

42
pkgs/tools/misc/gtkterm/default.nix Normal file
View File

@ -0,0 +1,42 @@
{ stdenv, lib, fetchFromGitHub, meson, ninja, pkg-config, gtk3, vte, libgudev, wrapGAppsHook }:
stdenv.mkDerivation rec {
pname = "gtkterm";
version = "1.1.1";
src = fetchFromGitHub {
owner = "Jeija";
repo = "gtkterm";
rev = "${version}";
sha256 = "0s2cx8w1n8d37pl80gll5h6dyvbqrfcam8l4wmvnqqww9jml6577";
};
nativeBuildInputs = [
meson
ninja
pkg-config
wrapGAppsHook
];
buildInputs = [
gtk3
vte
libgudev
];
meta = with lib; {
description = "A simple, graphical serial port terminal emulator";
homepage = "https://github.com/Jeija/gtkterm";
license = licenses.gpl3Plus;
longDescription = ''
GTKTerm is a simple, graphical serial port terminal emulator for
Linux and possibly other POSIX-compliant operating systems. It
can be used to communicate with all kinds of devices with a
serial interface, such as embedded computers, microcontrollers,
modems, GPS receivers, CNC machines and more.
'';
maintainers = with maintainers; [ wentasah ];
platforms = platforms.linux;
mainProgram = "gtkterm";
};
}

3
pkgs/tools/misc/mc/default.nix
View File

@ -46,14 +46,13 @@ stdenv.mkDerivation rec {
libX11
libssh2
openssl
perl
slang
zip
] ++ lib.optionals (!stdenv.isDarwin) [ e2fsprogs gpm ];
enableParallelBuilding = true;
configureFlags = [ "--enable-vfs-smb" ];
configureFlags = [ "--enable-vfs-smb" "PERL=${perl}/bin/perl" ];
postPatch = ''
substituteInPlace src/filemanager/ext.c \

7
pkgs/tools/networking/shadowsocks-rust/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, rustPlatform, CoreServices, libiconv }:
{ lib, stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl, CoreServices, libiconv }:
rustPlatform.buildRustPackage rec {
pname = "shadowsocks-rust";
@ -15,7 +15,10 @@ rustPlatform.buildRustPackage rec {
RUSTC_BOOTSTRAP = 1;
buildInputs = lib.optionals stdenv.isDarwin [ CoreServices libiconv ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ]
++ lib.optionals stdenv.isDarwin [ CoreServices libiconv ];
cargoBuildFlags = [
"--features=aead-cipher-extra,local-dns,local-http-native-tls,local-redir,local-tun"

6
pkgs/tools/virtualization/linode-cli/default.nix
View File

@ -13,8 +13,8 @@
let
sha256 = "1f0nrdg8hf650qxz79i3a1d2zyf24niyrcnbnhc9i7hzbnqbp5qg";
# specVersion taken from: https://www.linode.com/docs/api/openapi.yaml at `info.version`.
specVersion = "4.115.0";
specSha256 = "1s9pis1jl6d8znkb8hwsv89wzf38bhjing4x4q9ggy038y7xkkwg";
specVersion = "4.118.3";
specSha256 = "0jf4fnadcdfm4ja0d0m5rxcpg48cqsi9plaqz6kwyx3mp2snx9yc";
spec = fetchurl {
url = "https://raw.githubusercontent.com/linode/linode-api-docs/v${specVersion}/openapi.yaml";
sha256 = specSha256;
@ -24,7 +24,7 @@ in
buildPythonApplication rec {
pname = "linode-cli";
version = "5.17.1";
version = "5.17.2";
src = fetchFromGitHub {
owner = "linode";

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

@ -6778,9 +6778,7 @@ with pkgs;
ipfs = callPackage ../applications/networking/ipfs {
buildGoModule = buildGo116Module;
};
ipfs-cluster = callPackage ../applications/networking/ipfs-cluster {
buildGoModule = buildGo116Module;
};
ipfs-cluster = callPackage ../applications/networking/ipfs-cluster { };
ipfs-migrator-all-fs-repo-migrations = callPackage ../applications/networking/ipfs-migrator/all-migrations.nix {
buildGoModule = buildGo116Module;
@ -14095,7 +14093,7 @@ with pkgs;
regina = callPackage ../development/interpreters/regina { };
inherit (ocaml-ng.ocamlPackages_4_12) reason;
inherit (ocamlPackages) reason;
pixie = callPackage ../development/interpreters/pixie { };
dust = callPackage ../development/interpreters/pixie/dust.nix { };
@ -26133,6 +26131,8 @@ with pkgs;
got = callPackage ../applications/version-management/got { };
gtkterm = callPackage ../tools/misc/gtkterm { };
gtk-pipe-viewer = perlPackages.callPackage ../applications/video/pipe-viewer { withGtk3 = true; };
hydrus = python3Packages.callPackage ../applications/graphics/hydrus {

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

@ -4070,6 +4070,8 @@ in {
invoke = callPackage ../development/python-modules/invoke { };
iodata = callPackage ../development/python-modules/iodata { };
iocapture = callPackage ../development/python-modules/iocapture { };
iotawattpy = callPackage ../development/python-modules/iotawattpy { };