treewide: fixups for nixpkgs bump
This commit is contained in:
parent
7e47f3658e
commit
9f11be475b
9 changed files with 43 additions and 15 deletions
|
@ -38,13 +38,13 @@ let
|
|||
in
|
||||
buildPythonApplication rec {
|
||||
pname = "archipelago";
|
||||
version = "0.4.4";
|
||||
version = "0.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ArchipelagoMW";
|
||||
repo = "Archipelago";
|
||||
rev = version;
|
||||
sha256 = "sha256:1ny5sin43s95laqcjqmnh7bh6xx4mx3yx90rknxxp9bf7jqyrx7h";
|
||||
hash = "sha256-I6UHojEpC2/9bYK1khN1r+KsBTmU6zdsW8tpCYtB51I=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -33,6 +33,7 @@ let
|
|||
overrides = let
|
||||
assertVersion = pkg: wantVersion: lib.assertMsg (pkg.version == wantVersion) "${pkg.pname} (${pkg.version}) is different to what I expected (${wantVersion}); maybe remove the override?";
|
||||
in poetry2nix.overrides.withDefaults (self: super: {
|
||||
pytest-runner = null;
|
||||
cython = super.cython.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "0.29.33";
|
||||
src = self.fetchPypi {
|
||||
|
@ -52,9 +53,19 @@ let
|
|||
nativeBuildInputs = old.nativeBuildInputs ++ [ self.setuptools ];
|
||||
});
|
||||
opencontainers = super.opencontainers.overridePythonAttrs (old: {
|
||||
nativeBuildInputs = old.nativeBuildInputs ++ [ self.setuptools self.pytest-runner ];
|
||||
nativeBuildInputs = old.nativeBuildInputs ++ [ self.setuptools ];
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace-fail '["pytest-runner"]' '[]'
|
||||
'';
|
||||
});
|
||||
xmlsec = super.xmlsec.overridePythonAttrs (old: {
|
||||
xmlsec = super.xmlsec.overridePythonAttrs (old: rec {
|
||||
version = "1.3.14";
|
||||
src = self.fetchPypi {
|
||||
inherit (old) pname;
|
||||
inherit version;
|
||||
hash = "sha256-k0+ATy+JW824bx6u4ja2YQE1YO5p7BCNKc3W5fKSotk=";
|
||||
};
|
||||
nativeBuildInputs = (old.nativeBuildInputs or []) ++ [ self.pkgconfig ];
|
||||
buildInputs = (old.buildInputs or []) ++ [ pkgs.xmlsec pkgs.libxslt pkgs.libxml2 pkgs.libtool ];
|
||||
});
|
||||
|
|
2
nix/pkgs/baserow/backend/poetry.lock
generated
2
nix/pkgs/baserow/backend/poetry.lock
generated
|
@ -134,7 +134,7 @@ txaio = ">=21.2.1"
|
|||
[package.extras]
|
||||
all = ["PyGObject (>=3.40.0)", "argon2_cffi (>=20.1.0)", "attrs (>=20.3.0)", "base58 (>=2.1.0)", "cbor2 (>=5.2.0)", "cffi (>=1.14.5)", "click (>=8.1.2)", "ecdsa (>=0.16.1)", "eth-abi @ git+https://github.com/ethereum/eth-abi.git@v4.0.0-beta.2", "flatbuffers (>=22.12.6)", "hkdf (>=0.0.3)", "jinja2 (>=2.11.3)", "mnemonic (>=0.19)", "msgpack (>=1.0.2)", "passlib (>=1.7.4)", "py-ecc (>=5.1.0)", "py-eth-sig-utils (>=0.4.0)", "py-multihash (>=2.0.1)", "py-ubjson (>=0.16.1)", "pynacl (>=1.4.0)", "pyopenssl (>=20.0.1)", "python-snappy (>=0.6.0)", "pytrie (>=0.4.0)", "qrcode (>=7.3.1)", "rlp (>=2.0.1)", "service_identity (>=18.1.0)", "spake2 (>=0.8)", "twisted (>=20.3.0)", "ujson (>=4.0.2)", "web3[ipfs] @ git+https://github.com/ethereum/web3.py.git@v6.0.0-beta.9", "xbr (>=21.2.1)", "yapf (==0.29.0)", "zlmdb (>=21.2.1)", "zope.interface (>=5.2.0)"]
|
||||
compress = ["python-snappy (>=0.6.0)"]
|
||||
dev = ["backports.tempfile (>=1.0)", "bumpversion (>=0.5.3)", "codecov (>=2.0.15)", "flake8 (<5)", "humanize (>=0.5.1)", "mypy (>=0.610)", "passlib", "pep8-naming (>=0.3.3)", "pip (>=9.0.1)", "pyenchant (>=1.6.6)", "pyflakes (>=1.0.0)", "pyinstaller (>=4.2)", "pylint (>=1.9.2)", "pytest (>=3.4.2)", "pytest-aiohttp", "pytest-asyncio (>=0.14.0)", "pytest-runner (>=2.11.1)", "pyyaml (>=4.2b4)", "qualname", "sphinx (>=1.7.1)", "sphinx-autoapi (>=1.7.0)", "sphinx_rtd_theme (>=0.1.9)", "sphinxcontrib-images (>=0.9.1)", "tox (>=4.2.8)", "tox-gh-actions (>=2.2.0)", "twine (>=3.3.0)", "twisted (>=22.10.0)", "txaio (>=20.4.1)", "watchdog (>=0.8.3)", "wheel (>=0.36.2)", "yapf (==0.29.0)"]
|
||||
dev = ["backports.tempfile (>=1.0)", "bumpversion (>=0.5.3)", "codecov (>=2.0.15)", "flake8 (<5)", "humanize (>=0.5.1)", "mypy (>=0.610)", "passlib", "pep8-naming (>=0.3.3)", "pip (>=9.0.1)", "pyenchant (>=1.6.6)", "pyflakes (>=1.0.0)", "pyinstaller (>=4.2)", "pylint (>=1.9.2)", "pytest (>=3.4.2)", "pytest-aiohttp", "pytest-asyncio (>=0.14.0)", "pyyaml (>=4.2b4)", "qualname", "sphinx (>=1.7.1)", "sphinx-autoapi (>=1.7.0)", "sphinx_rtd_theme (>=0.1.9)", "sphinxcontrib-images (>=0.9.1)", "tox (>=4.2.8)", "tox-gh-actions (>=2.2.0)", "twine (>=3.3.0)", "twisted (>=22.10.0)", "txaio (>=20.4.1)", "watchdog (>=0.8.3)", "wheel (>=0.36.2)", "yapf (==0.29.0)"]
|
||||
encryption = ["pynacl (>=1.4.0)", "pyopenssl (>=20.0.1)", "pytrie (>=0.4.0)", "qrcode (>=7.3.1)", "service_identity (>=18.1.0)"]
|
||||
nvx = ["cffi (>=1.14.5)"]
|
||||
scram = ["argon2_cffi (>=20.1.0)", "cffi (>=1.14.5)", "passlib (>=1.7.4)"]
|
||||
|
|
|
@ -62,10 +62,26 @@ let
|
|||
opentelemetry-instrumentation-redis = addBuildInputs super.opentelemetry-instrumentation-redis [ self.hatchling ];
|
||||
opentelemetry-instrumentation-requests = addBuildInputs super.opentelemetry-instrumentation-requests [ self.hatchling ];
|
||||
opentelemetry-instrumentation-wsgi = addBuildInputs super.opentelemetry-instrumentation-wsgi [ self.hatchling ];
|
||||
django-health-check = addBuildInputs super.django-health-check [ self.sphinx self.setuptools-scm ];
|
||||
django-health-check = super.django-health-check.overridePythonAttrs (old: {
|
||||
buildInputs = (old.buildInputs or []) ++ [
|
||||
self.sphinx
|
||||
self.setuptools-scm
|
||||
];
|
||||
postPatch = ''
|
||||
sed -i '/pytest-runner/d' setup.cfg
|
||||
'';
|
||||
});
|
||||
pysaml2 = addBuildInputs super.pysaml2 [ self.poetry-core ];
|
||||
cython = python3.pkgs.cython_0;
|
||||
pystemmer = addBuildInputs super.pystemmer [ self.cython ];
|
||||
pytest-runner = null;
|
||||
uvloop = super.uvloop.overridePythonAttrs (old: {
|
||||
nativeBuildInputs = (old.nativeBuildInputs or []) ++ [
|
||||
self.pythonRelaxDepsHook
|
||||
self.setuptools
|
||||
];
|
||||
pythonRemoveDeps = [ "pytest-runner" ];
|
||||
});
|
||||
});
|
||||
|
||||
mkBackendSrc = { type, fromDir, pyproject, poetrylock, extra ? "" }: pkgs.runCommand "baserow-${type}-src" {
|
||||
|
|
|
@ -74,7 +74,7 @@
|
|||
|
||||
tailscale = import ./tailscale pkgs.tailscale;
|
||||
|
||||
archipelago = let callPackage = pkgs.python310.pkgs.callPackage; in
|
||||
archipelago = let callPackage = pkgs.python3.pkgs.callPackage; in
|
||||
callPackage ./archipelago {
|
||||
factorio-rcon-py = callPackage ./archipelago/factorio-rcon-py.nix { };
|
||||
};
|
||||
|
|
|
@ -3,8 +3,8 @@ let
|
|||
src = pkgs.fetchFromGitHub {
|
||||
owner = "isomer";
|
||||
repo = "erbium";
|
||||
rev = "1c4485addd6beeca39aa40340e4b31f04b5dad45";
|
||||
hash = "sha256:0a8yrdqndp2dc7xzmkm42pzk0alx96y38ssr7fq4spyz0g19vpwx";
|
||||
rev = "5a3bb817a00c8b13126cce8c125904bcdd933045";
|
||||
hash = "sha256-2loGY8DCmFpEAfda/uhVQlstON1jcHa0ynsZEaNOKAo=";
|
||||
};
|
||||
in
|
||||
import src {
|
||||
|
|
|
@ -29,7 +29,7 @@ stdenv.mkDerivation {
|
|||
|
||||
env.CFLAGS = "-D_SCTP_H";
|
||||
env.CXXFLAGS = lib.concatStringsSep " " [
|
||||
"-D_SCTP_H" # lksctp and glibc do not agree
|
||||
#"-D_SCTP_H" # lksctp and glibc do not agree
|
||||
|
||||
# /build/source/tests/unittests/phy/lower/processors/downlink/lower_phy_downlink_processor_test.cpp:796:75: error: comparison of integer expressions of different signedness: 'unsigned int' and 'int' [-Werror=sign-compare]
|
||||
# 796 | ASSERT_TRUE(md.tx_start.has_value() && (md.tx_start.value() == std::abs(t_offset)));
|
||||
|
|
|
@ -176,6 +176,7 @@ in {
|
|||
windowManager.i3.enable = true;
|
||||
videoDrivers = [ "nvidia" ];
|
||||
};
|
||||
hardware.nvidia.open = true;
|
||||
services.libinput.enable = true;
|
||||
specialisation.intelGraphics.configuration = {
|
||||
my.specialisationName = "intelGraphics";
|
||||
|
|
|
@ -523,11 +523,11 @@ in {
|
|||
services.samba = {
|
||||
enable = true;
|
||||
enableNmbd = false; # Eh, SMB1.0
|
||||
extraConfig = ''
|
||||
server min protocol = SMB3_11
|
||||
client min protocol = SMB3_11
|
||||
restrict anonymous = 1
|
||||
'';
|
||||
settings.global = {
|
||||
"server min protocol" = "SMB3_11";
|
||||
"client min protocol" = "SMB3_11";
|
||||
"restrict anonymous" = "1";
|
||||
};
|
||||
shares.content = {
|
||||
comment = "Content";
|
||||
browseable = "yes";
|
||||
|
|
Loading…
Reference in a new issue