Merge staging-next into staging

main
github-actions[bot] 2 years ago committed by GitHub
commit ba5812c3cd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      nixos/modules/services/web-apps/nextcloud.nix
  2. 4
      nixos/modules/virtualisation/nixos-containers.nix
  3. 3
      nixos/tests/containers-imperative.nix
  4. 23
      nixos/tests/os-prober.nix
  5. 21
      pkgs/applications/graphics/monado/default.nix
  6. 6
      pkgs/applications/misc/sigi/default.nix
  7. 21
      pkgs/applications/networking/3proxy/default.nix
  8. 12
      pkgs/applications/science/biology/kssd/default.nix
  9. 13
      pkgs/applications/science/math/nauty/default.nix
  10. 5
      pkgs/applications/science/math/pari/default.nix
  11. 39
      pkgs/applications/version-management/dvc/default.nix
  12. 33
      pkgs/data/fonts/openmoji/default.nix
  13. 4
      pkgs/data/misc/elliptic_curves/default.nix
  14. 39
      pkgs/development/embedded/nmrpflash/default.nix
  15. 4
      pkgs/development/libraries/nlohmann_json/default.nix
  16. 6
      pkgs/development/python-modules/aioftp/default.nix
  17. 8
      pkgs/development/python-modules/brother/default.nix
  18. 11
      pkgs/development/python-modules/cbor2/default.nix
  19. 6
      pkgs/development/python-modules/chess/default.nix
  20. 68
      pkgs/development/python-modules/deal-solver/default.nix
  21. 100
      pkgs/development/python-modules/deal/default.nix
  22. 31
      pkgs/development/python-modules/dpcontracts/default.nix
  23. 47
      pkgs/development/python-modules/dvc-render/default.nix
  24. 40
      pkgs/development/python-modules/dvclive/default.nix
  25. 78
      pkgs/development/python-modules/icontract/default.nix
  26. 4
      pkgs/development/python-modules/prometheus-client/default.nix
  27. 34
      pkgs/development/python-modules/pyschemes/default.nix
  28. 41
      pkgs/development/python-modules/pytest-test-utils/default.nix
  29. 56
      pkgs/development/python-modules/vaa/default.nix
  30. 6
      pkgs/development/tools/rust/cargo-tally/default.nix
  31. 9
      pkgs/games/oh-my-git/default.nix
  32. 83
      pkgs/games/openxray/default.nix
  33. 1
      pkgs/misc/drivers/hplip/default.nix
  34. 4
      pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix
  35. 6
      pkgs/servers/sql/mysql/8.0.x.nix
  36. 4
      pkgs/servers/web-apps/wiki-js/default.nix
  37. 9
      pkgs/tools/admin/lxd/default.nix
  38. 6
      pkgs/tools/admin/pgadmin/default.nix
  39. 12
      pkgs/tools/admin/pgadmin/package.json
  40. 3161
      pkgs/tools/admin/pgadmin/yarn.lock
  41. 2838
      pkgs/tools/admin/pgadmin/yarn.nix
  42. 7
      pkgs/tools/misc/rockbox-utility/default.nix
  43. 6
      pkgs/tools/text/each/default.nix
  44. 10
      pkgs/top-level/all-packages.nix
  45. 18
      pkgs/top-level/python-packages.nix

@ -733,7 +733,7 @@ in {
'trusted_domains' => ${writePhpArrary ([ cfg.hostName ] ++ c.extraTrustedDomains)},
'trusted_proxies' => ${writePhpArrary (c.trustedProxies)},
${optionalString (c.defaultPhoneRegion != null) "'default_phone_region' => '${c.defaultPhoneRegion}',"}
${optionalString (nextcloudGreaterOrEqualThan "23") "'profile.enabled' => ${boolToString cfg.globalProfiles}"}
${optionalString (nextcloudGreaterOrEqualThan "23") "'profile.enabled' => ${boolToString cfg.globalProfiles},"}
${objectstoreConfig}
];
'';

@ -284,7 +284,7 @@ let
DeviceAllow = map (d: "${d.node} ${d.modifier}") cfg.allowedDevices;
};
system = config.nixpkgs.localSystem.system;
inherit (config.nixpkgs) localSystem;
kernelVersion = config.boot.kernelPackages.kernel.version;
bindMountOpts = { name, ... }: {
@ -478,12 +478,12 @@ in
type = lib.mkOptionType {
name = "Toplevel NixOS config";
merge = loc: defs: (import "${toString config.nixpkgs}/nixos/lib/eval-config.nix" {
inherit system;
modules =
let
extraConfig = {
_file = "module at ${__curPos.file}:${toString __curPos.line}";
config = {
nixpkgs = { inherit localSystem; };
boot.isContainer = true;
networking.hostName = mkDefault name;
networking.useDHCP = false;

@ -18,8 +18,9 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
# container available within the VM, because we don't have network access.
virtualisation.additionalPaths = let
emptyContainer = import ../lib/eval-config.nix {
inherit (config.nixpkgs.localSystem) system;
modules = lib.singleton {
nixpkgs = { inherit (config.nixpkgs) localSystem; };
containers.foo.config = {
system.stateVersion = "18.03";
};

@ -75,21 +75,30 @@ in {
# The test cannot access the network, so any packages
# nixos-rebuild needs must be included in the VM.
system.extraDependencies = with pkgs;
[ sudo
libxml2.bin
libxslt.bin
[
brotli
brotli.dev
brotli.lib
desktop-file-utils
docbook5
docbook_xsl_ns
unionfs-fuse
ntp
grub2
kmod.dev
libarchive
libarchive.dev
libxml2.bin
libxslt.bin
nixos-artwork.wallpapers.simple-dark-gray-bottom
perlPackages.XMLLibXML
ntp
perlPackages.ListCompare
perlPackages.XMLLibXML
python3Minimal
shared-mime-info
stdenv
sudo
texinfo
unionfs-fuse
xorg.lndir
grub2
# add curl so that rather than seeing the test attempt to download
# curl's tarball, we see what it's trying to download

@ -1,7 +1,6 @@
{ lib
, stdenv
, fetchFromGitLab
, fetchpatch
, writeText
, cmake
, doxygen
@ -46,25 +45,16 @@
stdenv.mkDerivation rec {
pname = "monado";
version = "21.0.0";
version = "unstable-2022-05-28";
src = fetchFromGitLab {
domain = "gitlab.freedesktop.org";
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "07zxs96i3prjqww1f68496cl2xxqaidx32lpfyy0pn5am4c297zc";
owner = "monado";
repo = "monado";
rev = "011bcbdcff227e25507e5f2d81a83a2bbe478856";
sha256 = "sha256-8velNKSCZJtKO8ATwXDl1nU8RbxZ8TeyGiUQFOXifuI=";
};
patches = [
# https://github.com/NixOS/nixpkgs/issues/137245
# Fix warning after Vulkan 1.2.174 VK_NULL_HANDLE change
(fetchpatch {
url = "https://gitlab.freedesktop.org/monado/monado/-/commit/c47775a95d8e139a2f234063793eb6726f830510.patch";
sha256 = "093ymvi9ifpk4vyjcwhhci9cnscxwbv5f80xdbppcqa0j92nmkmp";
})
];
nativeBuildInputs = [
cmake
doxygen
@ -130,5 +120,6 @@ stdenv.mkDerivation rec {
license = licenses.boost;
maintainers = with maintainers; [ expipiplus1 prusnak ];
platforms = platforms.linux;
mainProgram = "monado-cli";
};
}

@ -2,14 +2,14 @@
rustPlatform.buildRustPackage rec {
pname = "sigi";
version = "3.3.0";
version = "3.4.0";
src = fetchCrate {
inherit pname version;
sha256 = "sha256-dcfzCac4dT2X1hgTSh30G7h2XtvVj1jMUmrUzqZ11y8=";
sha256 = "sha256-wqdgrFeB3YuMo/r4ndqRZCz+M1WuUvX2pHHkyNMdnvo=";
};
cargoSha256 = "sha256-CQofC9Y0y8XASLpjk9B6mMlSQqiXnoGZ8kJh16txiPA=";
cargoSha256 = "sha256-103zhlskzhEj6oUam7YDRWiSPTaV2PPJhzP7QeMBtDQ=";
nativeBuildInputs = [ installShellFiles ];
# In case anything goes wrong.

@ -1,29 +1,42 @@
{ lib, stdenv, fetchFromGitHub, coreutils, nixosTests }:
{ lib, stdenv, fetchFromGitHub, nixosTests }:
stdenv.mkDerivation rec {
pname = "3proxy";
version = "0.9.4";
src = fetchFromGitHub {
owner = "z3APA3A";
owner = "3proxy";
repo = pname;
rev = version;
sha256 = "sha256-4bLlQ/ULvpjs6fr19yBBln5mRRc+yj+zVLiTs1e/Ypc=";
};
# They use 'install -s', that calls the native strip instead of the cross.
# Don't strip binary on install, we strip it on fixup phase anyway.
postPatch = ''
substituteInPlace Makefile.Linux \
--replace "(INSTALL_BIN) -s" "(INSTALL_BIN)" \
--replace "/usr" ""
'';
makeFlags = [
"-f Makefile.Linux"
"INSTALL=${coreutils}/bin/install"
"INSTALL=install"
"DESTDIR=${placeholder "out"}"
"CC:=$(CC)"
];
postInstall = ''
rm -fr $out/var
'';
passthru.tests = {
smoke-test = nixosTests._3proxy;
};
meta = with lib; {
description = "Tiny free proxy server";
homepage = "https://github.com/z3APA3A/3proxy";
homepage = "https://github.com/3proxy/3proxy";
license = licenses.bsd2;
platforms = platforms.linux;
maintainers = with maintainers; [ misuzu ];

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, zlib, automake, autoconf, libtool }:
{ lib, stdenv, fetchFromGitHub, fetchpatch, zlib, automake, autoconf, libtool }:
stdenv.mkDerivation rec {
pname = "kssd";
@ -11,6 +11,16 @@ stdenv.mkDerivation rec {
sha256 = "sha256-8jzYqo9LXF66pQ1EIusm+gba2VbTYpJz2K3NVlA3QxY=";
};
patches = [
# Pull upstream patch for -fno-common toolchain support:
# https://github.com/yhg926/public_kssd/pull/9
(fetchpatch {
name = "fno-common.patch";
url = "https://github.com/yhg926/public_kssd/commit/cdd1e8aae256146f5913a3b4c723b638d53bdf27.patch";
sha256 = "sha256-HhaTRqPfKR+ouh0PwEH6u22pbuqbX2OypRzw8BXm0W4=";
})
];
nativeBuildInputs = [ autoconf automake ];
buildInputs = [ zlib libtool ];

@ -4,19 +4,24 @@
}:
stdenv.mkDerivation rec {
pname = "nauty";
version = "27r1";
version = "2.7r3";
src = fetchurl {
url = "https://pallini.di.uniroma1.it/nauty${version}.tar.gz";
sha256 = "0xsfqfcknbd6g6wzpa5l7crmmk3bf3zjh37rhylq6b20dqcmvjkn";
url = "https://pallini.di.uniroma1.it/nauty${builtins.replaceStrings ["."] [""] version}.tar.gz";
sha256 = "sha256-TwZltxalP3oU6irjAFnyPQZM4/5MEsATQE724e4LiMI=";
};
outputs = [ "out" "dev" ];
configureFlags = [
# Prevent nauty from sniffing some cpu features. While those are very
# widely available, it can lead to nasty bugs when they are not available:
# https://groups.google.com/forum/#!topic/sage-packaging/Pe4SRDNYlhA
"--enable-generic" # don't use -march=native
"--${if stdenv.hostPlatform.sse4_2Support then "enable" else "disable"}-popcnt"
"--${if stdenv.hostPlatform.sse4_aSupport then "enable" else "disable"}-clz"
];
installPhase = ''
mkdir -p "$out"/{bin,share/doc/nauty} "$dev"/{lib,include/nauty}
@ -28,7 +33,9 @@ stdenv.mkDerivation rec {
cp "$i" "$dev/lib/lib$i";
done
'';
checkTarget = "checks";
meta = with lib; {
description = "Programs for computing automorphism groups of graphs and digraphs";
license = licenses.asl20;

@ -13,7 +13,7 @@ assert withThread -> libpthreadstubs != null;
stdenv.mkDerivation rec {
pname = "pari";
version = "2.13.3";
version = "2.13.4";
src = fetchurl {
urls = [
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
# old versions are at the url below
"https://pari.math.u-bordeaux.fr/pub/pari/OLD/${lib.versions.majorMinor version}/${pname}-${version}.tar.gz"
];
hash = "sha256-zLp/FgbGhU8UQ2N7tXrQlY1Bx/R1P4roRZ8dZMJnoco=";
hash = "sha256-vN6ezq4VkoFDgcFpfNtwY1Z7ZQQgGxvke7WJIPO84YU=";
};
buildInputs = [
@ -82,5 +82,6 @@ stdenv.mkDerivation rec {
license = licenses.gpl2Plus;
maintainers = with maintainers; [ ertes AndersonTorres ] ++ teams.sage.members;
platforms = platforms.linux ++ platforms.darwin;
mainProgram = "gp";
};
}

@ -10,46 +10,24 @@
python3.pkgs.buildPythonApplication rec {
pname = "dvc";
version = "2.9.5";
version = "2.10.2";
format = "setuptools";
src = fetchFromGitHub {
owner = "iterative";
repo = pname;
rev = version;
hash = "sha256-MviiA0ja1IaxMPlqu2dhIGBcdEXiEvBYnK9731dihMg=";
hash = "sha256-boaQSg0jajWQZKB5wvcP2musVR2/pifT4pU64Y5hiQ0=";
};
# make the patch apply
prePatch = ''
substituteInPlace setup.cfg \
--replace "scmrepo==0.0.7" "scmrepo==0.0.10"
'';
patches = [
./dvc-daemon.patch
(fetchpatch {
url = "https://github.com/iterative/dvc/commit/ab54b5bdfcef3576b455a17670b8df27beb504ce.patch";
sha256 = "sha256-wzMK6Br7/+d3EEGpfPuQ6Trj8IPfehdUvOvX3HZlS+o=";
})
];
postPatch = ''
substituteInPlace setup.cfg \
--replace "grandalf==0.6" "grandalf>=0.6" \
--replace "scmrepo==0.0.13" "scmrepo"
substituteInPlace dvc/daemon.py \
--subst-var-by dvc "$out/bin/dcv"
'';
nativeBuildInputs = with python3.pkgs; [
setuptools-scm
setuptools-scm-git-archive
];
propagatedBuildInputs = with python3.pkgs; [
appdirs
aiohttp-retry
appdirs
colorama
configobj
configobj
@ -57,12 +35,15 @@ python3.pkgs.buildPythonApplication rec {
diskcache
distro
dpath
dvclive
dvc-render
flatten-dict
flufl_lock
funcy
grandalf
nanotime
networkx
packaging
pathspec
ply
psutil
@ -96,6 +77,14 @@ python3.pkgs.buildPythonApplication rec {
importlib-resources
];
postPatch = ''
substituteInPlace setup.cfg \
--replace "grandalf==0.6" "grandalf>=0.6" \
--replace "scmrepo==0.0.19" "scmrepo"
substituteInPlace dvc/daemon.py \
--subst-var-by dvc "$out/bin/dcv"
'';
# Tests require access to real cloud services
doCheck = false;

@ -1,7 +1,10 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, scfbuild
, fontforge
, libuninameslist
, nodejs
, nodePackages
, python3Packages
@ -14,6 +17,34 @@ let
[ "OpenMoji-Color.ttf" "OpenMoji-Black.ttf" ]
variant;
# With newer fontforge the build hangs, see
# https://github.com/NixOS/nixpkgs/issues/167869
# Patches etc taken from
# https://github.com/NixOS/nixpkgs/commit/69da642a5a9bb433138ba1b13c8d56fb5bb6ec05
fontforge-20201107 = fontforge.overrideAttrs (old: rec {
version = "20201107";
src = fetchFromGitHub {
owner = "fontforge";
repo = "fontforge";
rev = version;
sha256 = "sha256-Rl/5lbXaPgIndANaD0IakaDus6T53FjiBb45FIuGrvc=";
};
patches = [
(fetchpatch {
url = "https://salsa.debian.org/fonts-team/fontforge/raw/76bffe6ccf8ab20a0c81476a80a87ad245e2fd1c/debian/patches/0001-add-extra-cmake-install-rules.patch";
sha256 = "u3D9od2xLECNEHhZ+8dkuv9818tPkdP6y/Tvd9CADJg=";
})
(fetchpatch {
url = "https://github.com/fontforge/fontforge/commit/69e263b2aff29ad22f97f13935cfa97a1eabf207.patch";
sha256 = "06yyf90605aq6ppfiz83mqkdmnaq5418axp9jgsjyjq78b00xb29";
})
];
buildInputs = old.buildInputs ++ [ libuninameslist ];
});
scfbuild-with-fontforge-20201107 = scfbuild.override (old: {
fontforge = fontforge-20201107;
});
in stdenv.mkDerivation rec {
pname = "openmoji";
version = "13.1.0";
@ -26,7 +57,7 @@ in stdenv.mkDerivation rec {
};
nativeBuildInputs = [
scfbuild
scfbuild-with-fontforge-20201107
nodejs
nodePackages.glob
nodePackages.lodash

@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
pname = "elliptic_curves";
version = "0.8";
version = "0.8.1";
src = fetchurl {
url = "mirror://sageupstream/${pname}/${pname}-${version}.tar.bz2";
sha256 = "0pzaym44x88dn8rydiwqgm73yghzlgf7gqvd7qqsrsdl2vyp091w";
sha256 = "0l7xh4abw5sb4d37r0ylr3vwb88fpx2zrvfm5ql0c7yrv5q59fjz";
};

@ -0,0 +1,39 @@
{ fetchFromGitHub
, gcc
, lib
, libnl
, libpcap
, pkg-config
, stdenv
, writeShellScriptBin
}:
stdenv.mkDerivation rec {
pname = "nmrpflash";
version = "0.9.16";
src = fetchFromGitHub {
owner = "jclehner";
repo = "nmrpflash";
rev = "v${version}";
sha256 = "sha256-0nqdbXf1syUe7o5hoNIKLruKxkNaUsGolfZzoQY15j4==";
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [ libnl libpcap ];
PREFIX = "${placeholder "out"}";
STANDALONE_VERSION = "${version}";
preInstall = ''
mkdir -p $out/bin
'';
meta = with lib; {
description = "Netgear Unbrick Utility";
homepage = "https://github.com/jclehner/nmrpflash";
license = licenses.gpl3;
maintainers = with maintainers; [ dadada ];
platforms = platforms.unix;
};
}

@ -12,13 +12,13 @@ let
};
in stdenv.mkDerivation rec {
pname = "nlohmann_json";
version = "3.10.2";
version = "3.10.5";
src = fetchFromGitHub {
owner = "nlohmann";
repo = "json";
rev = "v${version}";
sha256 = "/OFNfukrIyfJmD0ko174aud9T6ZOesHANJjyfk4q/Vs=";
sha256 = "DTsZrdB9GcaNkx7ZKxcgCA3A9ShM5icSF0xyGguJNbk=";
};
nativeBuildInputs = [ cmake ];

@ -1,4 +1,5 @@
{ lib
, stdenv
, async-timeout
, buildPythonPackage
, fetchPypi
@ -32,6 +33,11 @@ buildPythonPackage rec {
trustme
];
disabledTests = lib.optionals stdenv.isDarwin [
# uses 127.0.0.2, which macos doesn't like
"test_pasv_connection_pasv_forced_response_address"
];
pythonImportsCheck = [
"aioftp"
];

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "brother";
version = "1.2.0";
version = "1.2.1";
format = "setuptools";
disabled = pythonOlder "3.8";
@ -18,8 +18,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "bieniu";
repo = pname;
rev = version;
hash = "sha256-hKOZ5pTDwhM0lOXoatXXVvEVxiTfxIpBRe3fFcUfzwE=";
rev = "refs/tags/${version}";
hash = "sha256-9SC4q2iZN0/fEYS4Ii7Ndcx5UpLryGCe9ytIVDdjg0M=";
};
propagatedBuildInputs = [
@ -38,7 +38,7 @@ buildPythonPackage rec {
substituteInPlace setup.py \
--replace '"pytest-runner"' ""
substituteInPlace requirements.txt \
--replace "pysnmplib==5.0.10" "pysnmplib>=5.0.10"
--replace "pysnmplib==" "pysnmplib>="
'';
pythonImportsCheck = [

@ -9,13 +9,14 @@
buildPythonPackage rec {
pname = "cbor2";
version = "5.4.2.post1";
version = "5.4.3";
format = "setuptools";
disabled = pythonOlder "3.6";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-nPIdWWBLlSnXh3yOA0Ki66rhoH/o/1aD3HX+wVhHx5c=";
hash = "sha256-Yrhjxe5s7UAyr+lI88FITzdVUJldO4SYFFI3/ijlRsI=";
};
nativeBuildInputs = [
@ -27,8 +28,8 @@ buildPythonPackage rec {
];
postPatch = ''
substituteInPlace setup.cfg \
--replace "--cov" ""
substituteInPlace pyproject.toml \
--replace " --cov" ""
'';
# https://github.com/agronholm/cbor2/issues/99

@ -7,15 +7,15 @@
buildPythonPackage rec {
pname = "chess";
version = "1.9.0";
version = "1.9.1";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "niklasf";
repo = "python-${pname}";
rev = "v${version}";
sha256 = "sha256-2/6pHU4gJnnVdO2KyXBe/RAbnEIuc2AY+h4TO70qiRk=";
rev = "refs/tags/v${version}";
sha256 = "sha256-sJ5mw9sQQn2IP7iDjYUGf6P3FqAbHJC1R4phnwVcNIM=";
};
pythonImportsCheck = [ "chess" ];

@ -0,0 +1,68 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pythonOlder
, flit-core
, z3
, astroid
, pytestCheckHook
, hypothesis
}:
buildPythonPackage rec {
pname = "deal-solver";
version = "0.1.0";
format = "pyproject";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "life4";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-eSSyLBwPc0rrfew91nLBagYDD6aJRyx0cE9YTTSODI8=";
};
nativeBuildInputs = [
flit-core
];
postPatch = ''
# Use upstream z3 implementation
substituteInPlace pyproject.toml \
--replace "\"z3-solver\"," "" \
--replace "\"--cov=deal_solver\"," "" \
--replace "\"--cov-report=html\"," "" \
--replace "\"--cov-report=xml\"," "" \
--replace "\"--cov-report=term-missing:skip-covered\"," "" \
--replace "\"--cov-fail-under=100\"," ""
'';
propagatedBuildInputs = [
z3
astroid
];
checkInputs = [
pytestCheckHook
hypothesis
];
disabledTests = [
# z3 assertion error
"test_expr_asserts_ok"
];
disabledTestPaths = [
# regex matching seems flaky on tests
"tests/test_stdlib/test_re.py"
];
pythonImportsCheck = [ "deal_solver" ];
meta = with lib; {
description = "Z3-powered solver (theorem prover) for deal";
homepage = "https://github.com/life4/deal-solver";
license = licenses.mit;
maintainers = with maintainers; [ gador ];
};
}

@ -0,0 +1,100 @@
{ lib
, buildPythonPackage
, pythonOlder
, fetchFromGitHub
, flit-core
, astroid
, pytestCheckHook
, docstring-parser
, isort
, marshmallow
, pytest-cov
, sphinx
, hypothesis
, vaa
, deal-solver
, pygments
, typeguard
, coverage
, urllib3
}:
buildPythonPackage rec {
pname = "deal";
version = "4.23.3";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "life4";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-duFxe2KSQQb7HB5KrrE32xzTb6QkQcrQssiuXLKao50=";
};
postPatch = ''
# don't do coverage
substituteInPlace pyproject.toml \
--replace "\"--cov-fail-under=100\"," "" \
--replace "\"--cov=deal\"," "" \
--replace "\"--cov-report=html\"," "" \
--replace "\"--cov-report=term-missing:skip-covered\"," ""
'';
nativeBuildInputs = [
flit-core
];
propagatedBuildInputs = [
astroid
deal-solver
pygments
typeguard
];
checkInputs = [
pytestCheckHook
docstring-parser
marshmallow
sphinx
hypothesis
vaa
urllib3
];
disabledTests = [
# needs internet access
"test_smoke_has"
"test_pure_offline"
"test_raises_doesnt_override_another_contract"
"test_raises_doesnt_override_another_contract_async"
"test_raises_generator"
# AttributeError: module 'vaa' has no attribute 'Error'
"test_source_vaa_scheme"
"test_vaa_scheme_and_custom_exception"
"test_scheme_string_validation_args_correct"
"test_method_chain_decorator_with_scheme_is_fulfilled"
"test_scheme_contract_is_satisfied_when_setting_arg"
"test_scheme_contract_is_satisfied_within_chain"
"test_scheme_errors_rewrite_message"
];
disabledTestPaths = [
# needs internet access
"tests/test_runtime/test_offline.py"
];
pythonImportsCheck = [ "deal" ];
meta = with lib; {
description = "Library for design by contract (DbC) and checking values, exceptions, and side-effects";
longDescription = ''
In a nutshell, deal empowers you to write bug-free code.
By adding a few decorators to your code, you get for free tests, static analysis, formal verification, and much more
'';
homepage = "https://github.com/life4/deal";
license = licenses.mit;
maintainers = with maintainers; [ gador ];
};
}

@ -0,0 +1,31 @@
{ lib
, buildPythonPackage
, pythonOlder
, fetchFromGitHub
}:
buildPythonPackage rec {
pname = "dpcontracts";
version = "unstable-2018-11-20";
format = "setuptools";
disabled = pythonOlder "3.5";
src = fetchFromGitHub {
owner = "deadpixi";
repo = "contracts";
rev = "45cb8542272c2ebe095c6efb97aa9407ddc8bf3c";
hash = "sha256-FygJPXo7lZ9tlfqY6KmPJ3PLIilMGLBr3013uj9hCEs=";
};
# package does not have any tests
doCheck = false;
pythonImportsCheck = [ "dpcontracts" ];
meta = with lib; {
description = "Provides a collection of decorators that makes it easy to write software using contracts";
homepage = "https://github.com/deadpixi/contracts";
license = licenses.lgpl3Only;
maintainers = with maintainers; [ gador ];
};
}

@ -0,0 +1,47 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, funcy
, pytestCheckHook
, pytest-mock
, pytest-test-utils
, pythonOlder
, tabulate
}:
buildPythonPackage rec {
pname = "dvc-render";
version = "0.0.5";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "iterative";
repo = pname;
rev = "v${version}";
hash = "sha256-dL+ampYgcC77G89rnh7t6lVp7WoIR85gjP0eg89ci3g=";
};
propagatedBuildInputs = [
funcy
tabulate
];
checkInputs = [
pytestCheckHook
pytest-mock
pytest-test-utils
];
pythonImportsCheck = [
"dvc_render"
];
meta = with lib; {
description = "Library for rendering DVC plots";
homepage = "https://github.com/iterative/dvclive";
license = licenses.asl20;
maintainers = with maintainers; [ fab ];
};
}

@ -0,0 +1,40 @@
{ lib
, buildPythonPackage
, dvc-render
, fetchFromGitHub
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
pname = "dvclive";
version = "0.8.2";
format = "pyproject";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "iterative";
repo = pname;
rev = version;
hash = "sha256-ditc4WWTEuO4ACqL87BNgjm1B6Aj6PPWrFX+OoF5jOI=";
};
propagatedBuildInputs = [
dvc-render
];
# Circular dependency with dvc
doCheck = false;
pythonImportsCheck = [
"dvclive"
];
meta = with lib; {
description = "Library for logging machine learning metrics and other metadata in simple file formats";
homepage = "https://github.com/iterative/dvclive";
license = licenses.asl20;
maintainers = with maintainers; [ fab ];
};
}

@ -0,0 +1,78 @@
{ lib
, buildPythonPackage
, pythonOlder
, fetchFromGitHub
, asttokens
, typing-extensions
, pytestCheckHook
, yapf
, docutils
, pygments
, dpcontracts
, tabulate
, py-cpuinfo
, typeguard
, astor
, numpy
, asyncstdlib
}:
buildPythonPackage rec {
pname = "icontract";
version = "2.6.1";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "Parquery";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-QyuegyjVyRLQS0DjBJXpTDNeBM7LigGJ5cztVOO7e3Y=";
};
preCheck = ''
# we don't want to use the precommit.py script to build the package.
# For the tests to succeed, "ICONTRACT_SLOW" needs to be set.
# see https://github.com/Parquery/icontract/blob/aaeb1b06780a34b05743377e4cb2458780e808d3/precommit.py#L57
export ICONTRACT_SLOW=1
'';
propagatedBuildInputs = [
asttokens
typing-extensions
];
checkInputs = [
pytestCheckHook
yapf
docutils
pygments
dpcontracts
tabulate
py-cpuinfo
typeguard
astor
numpy
asyncstdlib
];
disabledTestPaths = [
# needs an old version of deal to comply with the tests
# see https://github.com/Parquery/icontract/issues/244
"tests_with_others/test_deal.py"
# mypy decorator checks don't pass. For some reaseon mypy
# doesn't check the python file provided in the test.
"tests/test_mypy_decorators.py"
];
pythonImportsCheck = [ "icontract" ];
meta = with lib; {
description = "Provide design-by-contract with informative violation messages";
homepage = "https://github.com/Parquery/icontract";
changelog = "https://github.com/Parquery/icontract/blob/master/CHANGELOG.rst";
license = licenses.mit;
maintainers = with maintainers; [ gador ];
};
}

@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "prometheus-client";
version = "0.13.1";
version = "0.14.1";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -16,7 +16,7 @@ buildPythonPackage rec {
owner = "prometheus";
repo = "client_python";
rev = "v${version}";
sha256 = "sha256-1sMnlUOvvdlUuh288UalAdlf0a1mpnM+Y/upwlnL1H8=";
sha256 = "sha256-hvBdWOMDuzF91Hv4u//tF+z6la0JfiTQHlpS4TnWpmk=";
};
checkInputs = [

@ -0,0 +1,34 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pythonAtLeast
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "pyschemes";
version = "unstable-2017-11-08";
format = "setuptools";
disabled = pythonAtLeast "3.10";
src = fetchFromGitHub {
owner = "spy16";
repo = pname;
rev = "ca6483d13159ba65ba6fc2f77b90421c40f2bbf2";
hash = "sha256-PssucudvlE8mztwVme70+h+2hRW/ri9oV9IZayiZhdU=";
};
checkInputs = [
pytestCheckHook
];
pythonImportsCheck = [ "pyschemes" ];
meta = with lib; {
description = "A library for validating data structures in Python";
homepage = "https://github.com/spy16/pyschemes";
license = licenses.wtfpl;
maintainers = with maintainers; [ gador ];
};
}

@ -0,0 +1,41 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pytestCheckHook
, pytest
, pythonOlder
}:
buildPythonPackage rec {
pname = "pytest-test-utils";
version = "0.0.6";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "iterative";
repo = pname;
rev = version;
hash = "sha256-0lShdMNP2suN+JO0uKWwjsGQxFCRnCZEQp2h9hQNrrA=";
};
buildInputs = [
pytest
];
checkInputs = [
pytestCheckHook
];
pythonImportsCheck = [
"pytest_test_utils"
];
meta = with lib; {
description = "Pytest utilities for tests";
homepage = "https://github.com/iterative/pytest-test-utils";
license = licenses.asl20;
maintainers = with maintainers; [ fab ];
};
}

@ -0,0 +1,56 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, flit-core
, pytestCheckHook
, cerberus
, django
, djangorestframework
, marshmallow
, pyschemes
, wtforms
, email_validator
}:
buildPythonPackage rec {
pname = "vaa";
version = "0.2.1";
format = "pyproject";
src = fetchFromGitHub {
owner = "life4";
repo = pname;
rev = "refs/tags/v.${version}";
hash = "sha256-24GTTJSZ55ejyHoWP1/S3DLTKvOolAJr9UhWoOm84CU=";
};
postPatch = ''
substituteInPlace pyproject.toml \
--replace "requires = [\"flit\"]" "requires = [\"flit_core\"]" \
--replace "build-backend = \"flit.buildapi\"" "build-backend = \"flit_core.buildapi\""
'';
nativeBuildInputs = [
flit-core
];
checkInputs = [
pytestCheckHook
cerberus
django
djangorestframework
marshmallow
pyschemes
wtforms
email_validator
];
pythonImportsCheck = [ "vaa" ];
meta = with lib; {
description = "VAlidators Adapter makes validation by any existing validator with the same interface";
homepage = "https://github.com/life4/vaa";
license = licenses.mit;
maintainers = with maintainers; [ gador ];
};
}

@ -2,14 +2,14 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-tally";
version = "1.0.4";
version = "1.0.5";
src = fetchCrate {
inherit pname version;
sha256 = "sha256-GUH/qWAC1vBLVV3K/qjkABH1agkyJEuhZGds+8UP1kQ=";
sha256 = "sha256-LHkj+RiUF7Zg2egEDgpViAlhZEhrOBMgLaNdhk5BNFI=";
};
cargoSha256 = "sha256-qvWJvkNG7rPHvv2hqJrOyZOqqAhRvgWdrkgr/Tefnps=";
cargoSha256 = "sha256-am5AcgqRpMzCNvrfqreyTHqSxxI9qlqUmGU/SVW7TMY=";
buildInputs = lib.optionals stdenv.isDarwin [
DiskArbitration

@ -19,6 +19,7 @@
, libXrender
, libglvnd
, libpulseaudio
, perl
, zlib
, udev # for libudev
}:
@ -54,6 +55,7 @@ stdenv.mkDerivation rec {
libXrender
libglvnd
libpulseaudio
perl
zlib
udev
];
@ -70,6 +72,13 @@ stdenv.mkDerivation rec {
})
];
# patch shebangs so that e.g. the fake-editor script works:
# error: /usr/bin/env 'perl': No such file or directory
# error: There was a problem with the editor
postPatch = ''
patchShebangs scripts
'';
buildPhase = ''
runHook preBuild

@ -1,20 +1,34 @@
{ lib, stdenv, fetchFromGitHub, cmake, glew, freeimage, liblockfile
, openal, libtheora, SDL2, lzo, libjpeg, libogg, tbb
, pcre, makeWrapper, fetchpatch }:
{ lib
, stdenv
, fetchFromGitHub
, cmake
, glew
, freeimage
, liblockfile
, openal
, libtheora
, SDL2
, lzo
, libjpeg
, libogg
, pcre
, makeWrapper
, enableMultiplayer ? false # Requires old, insecure Crypto++ version
}:
let
version = "822-december-preview";
version = "1144-december-2021-rc1";
src = fetchFromGitHub {
owner = "OpenXRay";
repo = "xray-16";
rev = version;
fetchSubmodules = true;
sha256 = "06f3zjnib7hipyl3hnc6mwcj9f50kbwn522wzdjydz8qgdg60h3m";
sha256 = "07qj1lpp21g4p583gvz5h66y2q71ymbsz4g5nr6dcys0vm7ph88v";
};
# https://github.com/OpenXRay/xray-16/issues/518
cryptopp = stdenv.mkDerivation {
ancientCryptopp = stdenv.mkDerivation {
pname = "cryptopp";
version = "5.6.5";
@ -22,47 +36,59 @@ let
sourceRoot = "source/Externals/cryptopp";
makeFlags = [ "PREFIX=${placeholder "out"}" ];
installFlags = [ "PREFIX=${placeholder "out"}" ];
enableParallelBuilding = true;
doCheck = true;
dontStrip = true;
meta = with lib; {
description = "Crypto++, a free C++ class library of cryptographic schemes";
homepage = "https://cryptopp.com/";
license = with licenses; [ boost publicDomain ];
platforms = platforms.all;
knownVulnerabilities = [
"CVE-2019-14318"
];
};
};
in stdenv.mkDerivation rec {
in
stdenv.mkDerivation rec {
pname = "openxray";
inherit version src;
# TODO https://github.com/OpenXRay/GameSpy/pull/6, check if merged in version > 822
# Fixes format hardening
patches = [
(fetchpatch {
url = "https://github.com/OpenXRay/GameSpy/pull/6/commits/155af876281f5d94f0142886693314d97deb2d4c.patch";
sha256 = "1l0vcgvzzx8n56shpblpfdhvpr6c12fcqf35r0mflaiql8q7wn88";
stripLen = 1;
extraPrefix = "Externals/GameSpy/";
})
nativeBuildInputs = [
cmake
makeWrapper
];
cmakeFlags = [ "-DCMAKE_INCLUDE_PATH=${cryptopp}/include/cryptopp" ];
buildInputs = [
glew freeimage liblockfile openal cryptopp libtheora SDL2 lzo
libjpeg libogg tbb pcre
glew
freeimage
liblockfile
openal
libtheora
SDL2
lzo
libjpeg
libogg
pcre
] ++ lib.optionals enableMultiplayer [
ancientCryptopp
];
nativeBuildInputs = [ cmake makeWrapper ];
# Crashes can happen, we'd like them to be reasonably debuggable
cmakeBuildType = "RelWithDebInfo";
dontStrip = true;
# https://github.com/OpenXRay/xray-16/issues/786
preConfigure = ''
substituteInPlace src/xrCore/xrCore.cpp \
--replace /usr/share $out/share
'';
cmakeFlags = [
"-DUSE_CRYPTOPP=${if enableMultiplayer then "ON" else "OFF"}"
] ++ lib.optionals enableMultiplayer [
"-DCMAKE_INCLUDE_PATH=${ancientCryptopp}/include/cryptopp"
];
postInstall = ''
# needed because of SDL_LoadObject library loading code
@ -71,8 +97,9 @@ in stdenv.mkDerivation rec {
'';
meta = with lib; {
mainProgram = "xray-16";
description = "Improved version of the X-Ray Engine, the game engine used in the world-famous S.T.A.L.K.E.R. game series by GSC Game World";
homepage = src.meta.homepage;
homepage = "https://github.com/OpenXRay/xray-16/";
license = licenses.unfree // {
url = "https://github.com/OpenXRay/xray-16/blob/xd_dev/License.txt";
};

@ -81,6 +81,7 @@ python3Packages.buildPythonApplication {
usbutils
sip_4
dbus-python
distro
] ++ lib.optionals withQt5 [
pyqt5
pyqt5_sip

@ -10,13 +10,13 @@
stdenv.mkDerivation rec {
pname = "check_ssl_cert";
version = "2.25.0";
version = "2.27.0";
src = fetchFromGitHub {
owner = "matteocorti";
repo = "check_ssl_cert";
rev = "v${version}";
sha256 = "sha256-WjiUsf8PMlTsldMaxnQbgnC1XLVW6wz50JyX/3MbZ+k=";
sha256 = "sha256-R70disK654wKbrrs5QKy1reNDnjZgkXTlR/dAhikI6s=";
};
nativeBuildInputs = [

@ -6,11 +6,11 @@
let
self = stdenv.mkDerivation rec {
pname = "mysql";
version = "8.0.28";
version = "8.0.29";
src = fetchurl {
url = "https://dev.mysql.com/get/Downloads/MySQL-${self.mysqlVersion}/${pname}-${version}.tar.gz";
sha256 = "sha256-2Gk2nrbeTyuy2407Mbe3OWjjVuX/xDVPS5ZlirHkiyI=";
sha256 = "sha256-USFw+m94ppTW8Y0ZfpmdJxbuaNxUHXZE3ZIqNmNAcmY=";
};
nativeBuildInputs = [ bison cmake pkg-config ]
@ -20,8 +20,6 @@ self = stdenv.mkDerivation rec {
postPatch = ''
substituteInPlace cmake/libutils.cmake --replace /usr/bin/libtool libtool
substituteInPlace cmake/os/Darwin.cmake --replace /usr/bin/libtool libtool
substituteInPlace cmake/fido2.cmake \
--replace ''$\{MY_PKG_CONFIG_EXECUTABLE\} "${pkg-config}/bin/pkg-config"
'';
buildInputs = [

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "wiki-js";
version = "2.5.282";
version = "2.5.283";
src = fetchurl {
url = "https://github.com/Requarks/wiki/releases/download/v${version}/${pname}.tar.gz";
sha256 = "sha256-cXNO8ChZ2FGAmTmcQDqnZrJpFynmdoocqFy59VCy1RE=";
sha256 = "sha256-dQ1FWZ+WysdsRkbNapKm1psZx35biKrRvTfNklC89e8=";
};
sourceRoot = ".";

@ -11,13 +11,16 @@
buildGo118Package rec {
pname = "lxd";
version = "5.1";
version = "5.2";
goPackagePath = "github.com/lxc/lxd";
src = fetchurl {
url = "https://linuxcontainers.org/downloads/lxd/lxd-${version}.tar.gz";
sha256 = "sha256-MZ9Ok1BuIUTtqigLAYX7N8Q3TPfXRopeXIwbZ4GJJQo=";
urls = [
"https://linuxcontainers.org/downloads/lxd/lxd-${version}.tar.gz"
"https://github.com/lxc/lxd/releases/download/lxd-${version}/lxd-${version}.tar.gz"
];
sha256 = "sha256-4i0rNKGEjTOyCAsrHII1WvttNv3+SeZ/RLN0ntvALkw=";
};
postPatch = ''

@ -11,11 +11,11 @@
let
pname = "pgadmin";
version = "6.8";
version = "6.9";
src = fetchurl {
url = "https://ftp.postgresql.org/pub/pgadmin/pgadmin4/v${version}/source/pgadmin4-${version}.tar.gz";
sha256 = "sha256-kS9GV/j28zkXTJZkRrG2JDgas210rQqXOJrwwxzepbw=";
sha256 = "sha256-C/0UDbPUuKCF9BBrDdlETGl7ALpFOmGaaxHVHxrIPVo=";
};
yarnDeps = mkYarnModules {
@ -69,7 +69,7 @@ let
boto3
];
# override necessary on pgadmin4 6.8
# override necessary on pgadmin4 6.9
pythonPackages = python3.pkgs.overrideScope (final: prev: rec {
flask = prev.flask.overridePythonAttrs (oldAttrs: rec {
version = "2.0.3";

@ -95,7 +95,6 @@
"@types/classnames": "^2.2.6",
"@types/react": "^16.7.18",
"@types/react-dom": "^16.0.11",
"acitree": "git+https://github.com/imsurinder90/jquery-aciTree.git#rc.7",
"ajv": "^8.8.2",
"alertifyjs": "git+https://github.com/EnterpriseDB/AlertifyJS/#72c1d794f5b6d4ec13a68d123c08f19021afe263",
"aspen-decorations": "^1.0.2",
@ -116,7 +115,6 @@
"closest": "^0.0.1",
"codemirror": "^5.59.2",
"context-menu": "^2.0.0",
"copy-to-clipboard": "^3.3.1",
"css-loader": "^5.0.1",
"cssnano": "^5.0.2",
"dagre": "^0.8.4",
@ -138,23 +136,25 @@
"leaflet": "^1.5.1",
"lodash": "4.*",
"ml-matrix": "^6.5.0",
"moment": "^2.29.1",
"moment-timezone": "^0.5.33",
"moment": "^2.29.3",
"moment-timezone": "^0.5.34",
"mousetrap": "^1.6.3",
"notificar": "^1.0.1",
"notistack": "^1.0.10",
"path-fx": "^2.0.0",
"pathfinding": "^0.4.18",
"paths-js": "^0.4.9",
"pgadmin4-tree": "git+https://github.com/EnterpriseDB/pgadmin4-treeview/#c966febebcdffaa46f1ccf0769fe5308f179d613",
"pgadmin4-tree": "git+https://github.com/EnterpriseDB/pgadmin4-treeview/#2c288ccc0ae0c98b41e56e79abf1204be3861702",
"postcss": "^8.2.15",
"raf": "^3.4.1",
"rc-dock": "^3.2.9",
"react": "^17.0.1",
"react-aspen": "^1.1.0",
"react-checkbox-tree": "^1.7.2",
"react-data-grid": "git+https://github.com/adityatoshniwal/react-data-grid.git/#1dc310dfaf5afea359404e867b7cf54953f47d1e",
"react-dom": "^17.0.1",
"react-draggable": "^4.4.4",
"react-leaflet": "^3.2.2",
"react-rnd": "^10.3.5",
"react-router-dom": "^6.2.2",
"react-select": "^4.2.1",
@ -171,7 +171,7 @@
"styled-components": "^5.2.1",
"tablesorter": "^2.31.2",
"tempusdominus-bootstrap-4": "^5.1.2",
"tempusdominus-core": "^5.0.3",
"tempusdominus-core": "^5.19.3",
"underscore": "^1.13.1",
"url-loader": "^1.1.2",
"valid-filename": "^2.0.1",

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

@ -43,6 +43,13 @@ stdenv.mkDerivation rec {
lrelease rbutilqt.pro
'';
# Workaround build failure on -fno-common toolchains like upstream
# gcc-10. Otherwise build fails as:
# ld: libmkimxboot.a(elf.c.o):utils/imxtools/sbtools/misc.h:43: multiple definition of `g_nr_keys';
# libmkimxboot.a(mkimxboot.c.o):utils/imxtools/sbtools/misc.h:43: first defined here
# TODO: try to remove with 1.5.1 update.
NIX_CFLAGS_COMPILE = "-fcommon";
installPhase = ''
runHook preInstall

@ -5,16 +5,16 @@
rustPlatform.buildRustPackage rec {
pname = "each";
version = "0.1.3";
version = "0.2.0";
src = fetchFromGitHub {
owner = "arraypad";
repo = pname;
rev = "v${version}";
sha256 = "04rx8jf871l4darfx6029dhpnbpmzwjgzazayp1qcaadsk8207z5";
sha256 = "sha256-5Aa/uHWrU4bpWd28Uddnuhmi6guHy09W9AU8sAfea6I=";
};
cargoSha256 = "1r7nzfh7v2mlp0wdrcpqfj68h3zmip2m3d4z2nwxyikmw7c80car";
cargoSha256 = "sha256-sH9rraPNAIlW2KQVaZfYa10c1HHQpDgedY1+9e94RLE=";
meta = with lib; {
description = " A better way of working with structured data on the command line";

@ -15920,6 +15920,8 @@ with pkgs;
jre_headless = jre8_headless;
};
nmrpflash = callPackage ../development/embedded/nmrpflash { };
nwjs = callPackage ../development/tools/nwjs { };
nwjs-sdk = callPackage ../development/tools/nwjs {
@ -22291,9 +22293,9 @@ with pkgs;
mysql80 = callPackage ../servers/sql/mysql/8.0.x.nix {
inherit (darwin) cctools developer_cmds DarwinTools;
inherit (darwin.apple_sdk.frameworks) CoreServices;
boost = boost173; # Configure checks for specific version.
protobuf = protobuf3_11;
icu = icu67;
boost = boost177; # Configure checks for specific version.
protobuf = protobuf3_19;
icu = icu69;
};
mysql_jdbc = callPackage ../servers/sql/mysql/jdbc { };
@ -34253,11 +34255,11 @@ with pkgs;
configuration:
let
c = import (path + "/nixos/lib/eval-config.nix") {
inherit (stdenv.hostPlatform) system;
modules =
[(
{ lib, ... }: {
config.nixpkgs.pkgs = lib.mkDefault pkgs;
config.nixpkgs.localSystem = lib.mkDefault stdenv.hostPlatform;
}
)] ++ (
if builtins.isList configuration

@ -2135,6 +2135,10 @@ in {
ddt = callPackage ../development/python-modules/ddt { };
deal = callPackage ../development/python-modules/deal { };
deal-solver = callPackage ../development/python-modules/deal-solver { };
deap = callPackage ../development/python-modules/deap { };
debian = callPackage ../development/python-modules/debian { };
@ -2544,6 +2548,8 @@ in {
dpath = callPackage ../development/python-modules/dpath { };
dpcontracts = callPackage ../development/python-modules/dpcontracts { };
dpkt = callPackage ../development/python-modules/dpkt { };
dragonfly = callPackage ../development/python-modules/dragonfly { };
@ -2602,6 +2608,10 @@ in {
durus = callPackage ../development/python-modules/durus { };
dvclive = callPackage ../development/python-modules/dvclive { };
dvc-render = callPackage ../development/python-modules/dvc-render { };
dwdwfsapi = callPackage ../development/python-modules/dwdwfsapi { };
dyn = callPackage ../development/python-modules/dyn { };
@ -4099,6 +4109,8 @@ in {
idasen = callPackage ../development/python-modules/idasen { };
icontract = callPackage ../development/python-modules/icontract { };
identify = callPackage ../development/python-modules/identify { };
idna = callPackage ../development/python-modules/idna { };
@ -6523,6 +6535,8 @@ in {
pysbd = callPackage ../development/python-modules/pysbd { };
pyschemes = callPackage ../development/python-modules/pyschemes { };
pyshark = callPackage ../development/python-modules/pyshark { };
pysiaalarm = callPackage ../development/python-modules/pysiaalarm { };
@ -8299,6 +8313,8 @@ in {
pytest-sugar = callPackage ../development/python-modules/pytest-sugar { };
pytest-test-utils = callPackage ../development/python-modules/pytest-test-utils { };
pytest-testmon = callPackage ../development/python-modules/pytest-testmon { };
pytest-timeout = callPackage ../development/python-modules/pytest-timeout { };
@ -10829,6 +10845,8 @@ in {
inherit (pkgs.darwin.apple_sdk.frameworks) ApplicationServices CoreServices;
};
vaa = callPackage ../development/python-modules/vaa { };
validate-email = callPackage ../development/python-modules/validate-email { };
validators = callPackage ../development/python-modules/validators { };

Loading…
Cancel
Save