diff options
55 files changed, 469 insertions, 638 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index bc9aaed9c80..cbed76919bd 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4187,6 +4187,16 @@ githubId = 313929; name = "Gabriel Ebner"; }; + genofire = { + name = "genofire"; + email = "geno+dev@fireorbit.de"; + github = "genofire"; + githubId = 6905586; + keys = [{ + longkeyid = "rsa4096/0xFC83907C125BC2BC"; + fingerprint = "386E D1BF 848A BB4A 6B4A 3C45 FC83 907C 125B C2BC"; + }]; + }; georgewhewell = { email = "georgerw@gmail.com"; github = "georgewhewell"; diff --git a/nixos/modules/services/databases/hbase.nix b/nixos/modules/services/databases/hbase.nix index 183c8a2f46d..181be2d6b0b 100644 --- a/nixos/modules/services/databases/hbase.nix +++ b/nixos/modules/services/databases/hbase.nix @@ -22,7 +22,10 @@ let configAttr)); configFile = pkgs.writeText "hbase-site.xml" - (buildProperty (defaultConfig // cfg.settings)); + ''<configuration> + ${buildProperty (defaultConfig // cfg.settings)} + </configuration> + ''; configDir = pkgs.runCommand "hbase-config-dir" { preferLocalBuild = true; } '' mkdir -p $out diff --git a/nixos/tests/hibernate.nix b/nixos/tests/hibernate.nix index 4f05b99a5a1..fc6857e2fd0 100644 --- a/nixos/tests/hibernate.nix +++ b/nixos/tests/hibernate.nix @@ -51,6 +51,7 @@ in makeTest { connect-timeout = 1 ''; + virtualisation.memorySize = 2048; virtualisation.diskSize = 8 * 1024; virtualisation.emptyDiskImages = [ # Small root disk for installer diff --git a/pkgs/applications/audio/vimpc/default.nix b/pkgs/applications/audio/vimpc/default.nix index a576898128e..5cc3c109999 100644 --- a/pkgs/applications/audio/vimpc/default.nix +++ b/pkgs/applications/audio/vimpc/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , autoreconfHook , libmpdclient , ncurses @@ -21,6 +22,16 @@ stdenv.mkDerivation rec { sha256 = "0lswzkap2nm7v5h7ppb6a64cb35rajysd09nb204rxgrkij4m6nx"; }; + patches = [ + # Pull fix pending upstream inclusion for ncurses-6.3: + # https://github.com/boysetsfrog/vimpc/pull/100 + (fetchpatch { + name = "ncurses-6.3.patch"; + url = "https://github.com/boysetsfrog/vimpc/commit/055ecdce0720fdfc9ec2528c520b6c33da36271b.patch"; + sha256 = "01p858jjxm0bf8hnk1z8h45j8c1y9i995mafa6ff3vg9vlak61pv"; + }) + ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libmpdclient ncurses pcre taglib curl ]; diff --git a/pkgs/applications/audio/zynaddsubfx/default.nix b/pkgs/applications/audio/zynaddsubfx/default.nix index 4b3cbb171bd..e738a0fbcbe 100644 --- a/pkgs/applications/audio/zynaddsubfx/default.nix +++ b/pkgs/applications/audio/zynaddsubfx/default.nix @@ -89,6 +89,19 @@ in stdenv.mkDerivation rec { doCheck = true; checkInputs = [ cxxtest ]; + # TODO: Update cmake hook to make it simpler to selectively disable cmake tests: #113829 + checkPhase = let + # Tests fail on aarch64 + disabledTests = lib.optionals stdenv.isAarch64 [ + "MessageTest" + "UnisonTest" + ]; + in '' + runHook preCheck + ctest --output-on-failure -E '^${lib.concatStringsSep "|" disabledTests}$' + runHook postCheck + ''; + # When building with zest GUI, patch plugins # and standalone executable to properly locate zest postFixup = lib.optionalString (guiModule == "zest") '' diff --git a/pkgs/applications/graphics/f3d/default.nix b/pkgs/applications/graphics/f3d/default.nix index 92875bcaeee..bcf707bcced 100644 --- a/pkgs/applications/graphics/f3d/default.nix +++ b/pkgs/applications/graphics/f3d/default.nix @@ -1,15 +1,14 @@ -{ lib, stdenv, fetchFromGitLab, cmake, vtk_9, libX11, libGL, Cocoa, OpenGL }: +{ lib, stdenv, fetchFromGitHub, cmake, vtk_9, libX11, libGL, Cocoa, OpenGL }: stdenv.mkDerivation rec { pname = "f3d"; - version = "1.1.0"; + version = "1.1.1"; - src = fetchFromGitLab { - domain = "gitlab.kitware.com"; - owner = "f3d"; + src = fetchFromGitHub { + owner = "f3d-app"; repo = "f3d"; rev = "v${version}"; - sha256 = "0lj20k5qyw9z85k3wsp05f7dcv7v7asrnppi8i1jm32dzxjm4siw"; + sha256 = "sha256-ToFP2Q+Oi+MEU9FEe5CNp0pD0bQUBQh34B9guajnqgI="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix index 1715542adce..17d87b60fec 100644 --- a/pkgs/applications/graphics/gimp/plugins/default.nix +++ b/pkgs/applications/graphics/gimp/plugins/default.nix @@ -125,6 +125,8 @@ in buildInputs = with pkgs; [ fftw ]; postPatch = '' + substituteInPlace Makefile --replace '$(GCC)' '$(CC)' + # The tarball contains a prebuilt binary. make clean ''; diff --git a/pkgs/applications/networking/browsers/chromium/update.py b/pkgs/applications/networking/browsers/chromium/update.py index 72d6df055b3..f13bda6f507 100755 --- a/pkgs/applications/networking/browsers/chromium/update.py +++ b/pkgs/applications/networking/browsers/chromium/update.py @@ -5,6 +5,7 @@ via upstream-info.json.""" # Usage: ./update.py [--commit] +import base64 import csv import json import re @@ -48,9 +49,10 @@ def nix_prefetch_git(url, rev): def get_file_revision(revision, file_path): """Fetches the requested Git revision of the given Chromium file.""" - url = f'https://raw.githubusercontent.com/chromium/chromium/{revision}/{file_path}' + url = f'https://chromium.googlesource.com/chromium/src/+/refs/tags/{revision}/{file_path}?format=TEXT' with urlopen(url) as http_response: - return http_response.read() + resp = http_response.read() + return base64.b64decode(resp) def get_matching_chromedriver(version): diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index c8797423bed..20e58981338 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -10,7 +10,6 @@ , hunspellDicts, spellcheckerLanguage ? null # E.g. "de_DE" # For a full list of available languages: # $ cat pkgs/development/libraries/hunspell/dictionaries.nix | grep "dictFileName =" | awk '{ print $3 }' -, sqlcipher }: let @@ -23,42 +22,9 @@ let --set HUNSPELL_DICTIONARIES "${hunspellDicts.${hunspellDict}}/share/hunspell" \ --set LC_MESSAGES "${spellcheckerLanguage}"''); - sqlcipher-signal = sqlcipher.overrideAttrs (_: { - # Using the same features as the upstream signal sqlcipher build - # https://github.com/signalapp/better-sqlite3/blob/2fa02d2484e9f9a10df5ac7ea4617fb2dff30006/deps/defines.gypi - CFLAGS = [ - "-DSQLITE_LIKE_DOESNT_MATCH_BLOBS" - "-DSQLITE_THREADSAFE=2" - "-DSQLITE_USE_URI=0" - "-DSQLITE_DEFAULT_MEMSTATUS=0" - "-DSQLITE_OMIT_DEPRECATED" - "-DSQLITE_OMIT_GET_TABLE" - "-DSQLITE_OMIT_TCL_VARIABLE" - "-DSQLITE_OMIT_PROGRESS_CALLBACK" - "-DSQLITE_OMIT_SHARED_CACHE" - "-DSQLITE_TRACE_SIZE_LIMIT=32" - "-DSQLITE_DEFAULT_CACHE_SIZE=-16000" - "-DSQLITE_DEFAULT_FOREIGN_KEYS=1" - "-DSQLITE_DEFAULT_WAL_SYNCHRONOUS=1" - "-DSQLITE_ENABLE_COLUMN_METADATA" - "-DSQLITE_ENABLE_UPDATE_DELETE_LIMIT" - "-DSQLITE_ENABLE_STAT4" - "-DSQLITE_ENABLE_FTS5" - "-DSQLITE_ENABLE_JSON1" - "-DSQLITE_ENABLE_RTREE" - "-DSQLITE_INTROSPECTION_PRAGMAS" - - # SQLCipher-specific options - "-DSQLITE_HAS_CODEC" - "-DSQLITE_TEMP_STORE=2" - "-DSQLITE_SECURE_DELETE" - ]; - - LDFLAGS = [ "-lm" ]; - }); in stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "5.23.1"; # Please backport all updates to the stable channel. + version = "5.24.0"; # Please backport all updates to the stable channel. # All releases have a limited lifetime and "expire" 90 days after the release. # When releases "expire" the application becomes unusable until an update is # applied. The expiration date for the current release can be extracted with: @@ -68,7 +34,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "0scbnkkbaqyqiz6bfvhdrc0yqnccjsf66iggjpa7kjyk3cy61s6c"; + sha256 = "1p19vs4wxlghv8cbsq5k4bl8h9fzr9izp4k4qs5fcnqiy1z92ycy"; }; nativeBuildInputs = [ @@ -153,7 +119,6 @@ in stdenv.mkDerivation rec { preFixup = '' gappsWrapperArgs+=( --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc ] }" - --prefix LD_PRELOAD : "${sqlcipher-signal}/lib/libsqlcipher.so" ${customLanguageWrapperArgs} ) diff --git a/pkgs/applications/networking/instant-messengers/viber/default.nix b/pkgs/applications/networking/instant-messengers/viber/default.nix index 53eea50767f..97df6d643c8 100644 --- a/pkgs/applications/networking/instant-messengers/viber/default.nix +++ b/pkgs/applications/networking/instant-messengers/viber/default.nix @@ -6,12 +6,12 @@ stdenv.mkDerivation { pname = "viber"; - version = "13.3.1.22"; + version = "16.1.0.37"; src = fetchurl { # Official link: https://download.cdn.viber.com/cdn/desktop/Linux/viber.deb - url = "http://web.archive.org/web/20210602004133/https://download.cdn.viber.com/cdn/desktop/Linux/viber.deb"; - sha256 = "0rs26x0lycavybn6k1hbb5kzms0zzcmxlrmi4g8k7vyafj6s8dqh"; + url = "https://web.archive.org/web/20211119123858/https://download.cdn.viber.com/cdn/desktop/Linux/viber.deb"; + sha256 = "sha256-hOz+EQc2OOlLTPa2kOefPJMUyWvSvrgqgPgBKjWE3p8="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index a0f3b5efbae..09a56fda7b7 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -1177,6 +1177,8 @@ rec { # The default 9P msize value is 8 KiB, which according to QEMU is # insufficient and would degrade performance. # See: https://wiki.qemu.org/Documentation/9psetup#msize - # Use 500 KiB as a conservative default, see also https://github.com/NixOS/nixpkgs/pull/142577#issuecomment-953848731 - default9PMsizeBytes = 512000; + # Use 128KiB which is the default in linux 5.15+ + # https://github.com/torvalds/linux/commit/9c4d94dc9a64426d2fa0255097a3a84f6ff2eebe + # TODO: actually set it to 128KiB, it was causing failures in many tests due to memory usage + default9PMsizeBytes = 16 * 1024; } diff --git a/pkgs/desktops/mate/mate-screensaver/default.nix b/pkgs/desktops/mate/mate-screensaver/default.nix index f33c47cbf0a..d80a19e29bb 100644 --- a/pkgs/desktops/mate/mate-screensaver/default.nix +++ b/pkgs/desktops/mate/mate-screensaver/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mate-screensaver"; - version = "1.26.0"; + version = "1.26.1"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0xmgzrb5nk7x6ganf7jd4gmdafanx7f0znga0lhsd8kd40r40la1"; + sha256 = "T72yHqSlnqjeM+qb93bYaXU+SSlWBGZMMOIg4JZZuLw="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/mate/mozo/default.nix b/pkgs/desktops/mate/mozo/default.nix index 3a02b03ceb7..6388b2319e8 100644 --- a/pkgs/desktops/mate/mozo/default.nix +++ b/pkgs/desktops/mate/mozo/default.nix @@ -2,14 +2,14 @@ python3.pkgs.buildPythonApplication rec { pname = "mozo"; - version = "1.26.0"; + version = "1.26.1"; format = "other"; doCheck = false; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1hnxqdk69g7j809k6picgq8y626hnyznlzxd0pi743gshpwwnhj6"; + sha256 = "DyRCmjsDe9BojsTDkdnYeB5Csj7zRfXlCvHnLF7y+jk="; }; nativeBuildInputs = [ pkg-config gettext gobject-introspection wrapGAppsHook ]; diff --git a/pkgs/development/compilers/souffle/default.nix b/pkgs/development/compilers/souffle/default.nix index e57062642ba..dada4dfe9e8 100644 --- a/pkgs/development/compilers/souffle/default.nix +++ b/pkgs/development/compilers/souffle/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub, fetchpatch , perl, ncurses, zlib, sqlite, libffi , autoreconfHook, mcpp, bison, flex, doxygen, graphviz , makeWrapper @@ -19,6 +19,16 @@ stdenv.mkDerivation rec { sha256 = "1fa6yssgndrln8qbbw2j7j199glxp63irfrz1c2y424rq82mm2r5"; }; + patches = [ + # Pull pending unstream inclusion fix for ncurses-6.3: + # https://github.com/souffle-lang/souffle/pull/2134 + (fetchpatch { + name = "ncurses-6.3.patch"; + url = "https://github.com/souffle-lang/souffle/commit/9e4bdf86d051ef2e1b1a1be64aff7e498fd5dd20.patch"; + sha256 = "0jw1b6qfdf49dx2qlzn1b2yzrgpnkil4w9y3as1m28w8ws7iphpa"; + }) + ]; + nativeBuildInputs = [ autoreconfHook bison flex mcpp doxygen graphviz makeWrapper perl ]; buildInputs = [ ncurses zlib sqlite libffi ]; @@ -29,7 +39,7 @@ stdenv.mkDerivation rec { # see 565a8e73e80a1bedbb6cc037209c39d631fc393f and parent commits upstream for # Wno-error fixes - patchPhase = '' + postPatch = '' substituteInPlace ./src/Makefile.am \ --replace '-Werror' '-Werror -Wno-error=deprecated -Wno-error=other' diff --git a/pkgs/development/libraries/intel-gmmlib/default.nix b/pkgs/development/libraries/intel-gmmlib/default.nix index 1304607b317..59aaeb6ad92 100644 --- a/pkgs/development/libraries/intel-gmmlib/default.nix +++ b/pkgs/development/libraries/intel-gmmlib/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "intel-gmmlib"; - version = "21.3.2"; + version = "21.3.3"; src = fetchFromGitHub { owner = "intel"; repo = "gmmlib"; rev = "intel-gmmlib-${version}"; - sha256 = "0whi7dmdv36d5l90yhjyv2raj2j165q82h7df9a6wf2abvsaqvdh"; + sha256 = "0hvly3fykhy4m7mzaa7xadaz7jz8krnfgj3zgzl2a2rpzja6frdn"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/python-modules/aiovlc/default.nix b/pkgs/development/python-modules/aiovlc/default.nix new file mode 100644 index 00000000000..c41a3902370 --- /dev/null +++ b/pkgs/development/python-modules/aiovlc/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, click +, fetchFromGitHub +, pytest-asyncio +, pytest-timeout +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "aiovlc"; + version = "0.1.0"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "MartinHjelmare"; + repo = pname; + rev = "v${version}"; + sha256 = "jB2V/Wpxmp92wba41mWZAeO63wy3NrkupllGxJMNkFM="; + }; + + propagatedBuildInputs = [ + click + ]; + + checkInputs = [ + pytest-asyncio + pytest-timeout + pytestCheckHook + ]; + + pythonImportsCheck = [ + "aiovlc" + ]; + + meta = with lib; { + description = "Python module to control VLC"; + homepage = "https://github.com/MartinHjelmare/aiovlc"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/dogpile-core/default.nix b/pkgs/development/python-modules/dogpile-core/default.nix deleted file mode 100644 index 32a1f59e927..00000000000 --- a/pkgs/development/python-modules/dogpile-core/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, buildPythonPackage, fetchPypi }: - -buildPythonPackage rec { - pname = "dogpile-core"; - version = "0.4.1"; - - src = fetchPypi { - pname = "dogpile.core"; - inherit version; - sha256 = "0xpdvg4kr1isfkrh1rfsh7za4q5a5s6l2kf9wpvndbwf3aqjyrdy"; - }; - - doCheck = false; - - pythonImportsCheck = [ "dogpile.core" ]; - - meta = with lib; { - description = "A 'dogpile' lock, typically used as a component of a larger caching solution"; - homepage = "https://bitbucket.org/zzzeek/dogpile.core"; - license = licenses.bsd3; - maintainers = with maintainers; [ ]; - }; -} diff --git a/pkgs/development/python-modules/falcon/default.nix b/pkgs/development/python-modules/falcon/default.nix index a42da353fc6..5dba22d8391 100644 --- a/pkgs/development/python-modules/falcon/default.nix +++ b/pkgs/development/python-modules/falcon/default.nix @@ -1,17 +1,28 @@ { lib , buildPythonPackage -, fetchPypi , pythonOlder +, fetchPypi +, pytestCheckHook , aiofiles , cbor2 +, ddt +, gunicorn , httpx +, hypercorn +, jsonschema , msgpack +, mujson +, nose +, orjson , pecan , pytest-asyncio -, pytestCheckHook +, python-mimeparse , pyyaml +, rapidjson , requests , testtools +, ujson +, uvicorn , websockets }: @@ -29,24 +40,31 @@ buildPythonPackage rec { checkInputs = [ aiofiles cbor2 + ddt + gunicorn httpx + hypercorn + jsonschema msgpack + mujson + nose + orjson pecan pytest-asyncio pytestCheckHook + python-mimeparse pyyaml + rapidjson requests testtools + ujson + uvicorn websockets ]; disabledTestPaths = [ # missing optional nuts package "falcon/bench/nuts/nuts/tests/test_functional.py" - # missing optional mujson package - "tests/test_media_handlers.py" - # tries to run uvicorn binary and doesn't find it - "tests/asgi/test_asgi_servers.py" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/imap-tools/default.nix b/pkgs/development/python-modules/imap-tools/default.nix index eb81678ae4f..dcee12d68c3 100644 --- a/pkgs/development/python-modules/imap-tools/default.nix +++ b/pkgs/development/python-modules/imap-tools/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "imap-tools"; - version = "0.49.1"; + version = "0.50.0"; disabled = isPy27; @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "ikvk"; repo = "imap_tools"; rev = "v${version}"; - sha256 = "071bri1h6j8saqqlb50zibdrk5hgkpwp4ysiskl1zin18794bq82"; + sha256 = "sha256-4OMWLWvNRg7z4KAAkB1l5YaWILFwIepZOWhBd64SGWI="; }; checkInputs = [ @@ -29,9 +29,6 @@ buildPythonPackage rec { "test_connectio" "test_attributes" "test_live" - # logic operator tests broken in 0.49.0 - # https://github.com/ikvk/imap_tools/issues/143 - "test_logic_operators" ]; pythonImportsCheck = [ "imap_tools" ]; diff --git a/pkgs/development/python-modules/justbackoff/default.nix b/pkgs/development/python-modules/justbackoff/default.nix new file mode 100644 index 00000000000..814d1d3e53f --- /dev/null +++ b/pkgs/development/python-modules/justbackoff/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "justbackoff"; + version = "0.6.0"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "alexferl"; + repo = pname; + rev = "v${version}"; + sha256 = "097j6jxgl4b3z46x9y9z10643vnr9v831vhagrxzrq6nviil2z6l"; + }; + + checkInputs = [ + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace setup.py \ + --replace "pytest-runner>=5.2" "" + ''; + + pythonImportsCheck = [ + "justbackoff" + ]; + + meta = with lib; { + description = "Simple backoff algorithm in Python"; + homepage = "https://github.com/alexferl/justbackoff"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/ludios_wpull/default.nix b/pkgs/development/python-modules/ludios_wpull/default.nix index e87146f6fbc..0045f4b3e0f 100644 --- a/pkgs/development/python-modules/ludios_wpull/default.nix +++ b/pkgs/development/python-modules/ludios_wpull/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchFromGitHub -, isPy3k , chardet , dnspython , html5-parser @@ -15,15 +14,16 @@ buildPythonPackage rec { pname = "ludios_wpull"; - version = "3.0.7"; + version = "3.0.9"; - disabled = (!isPy3k) || (pythonAtLeast "3.8"); + # https://github.com/ArchiveTeam/ludios_wpull/issues/20 + disabled = pythonAtLeast "3.9"; src = fetchFromGitHub { rev = version; - owner = "ludios"; - repo = "wpull"; - sha256 = "1j96avm0ynbazypzp766wh26n4qc73y7wgsiqfrdfl6x7rx20wgf"; + owner = "ArchiveTeam"; + repo = "ludios_wpull"; + sha256 = "0j4dir0dgg8pkf4d1znicz6wyyi1wzij50r21z838cycsdr54j4c"; }; propagatedBuildInputs = [ chardet dnspython html5-parser lxml namedlist sqlalchemy tornado Yapsy ]; @@ -33,7 +33,7 @@ buildPythonPackage rec { meta = { description = "Web crawler; fork of wpull used by grab-site"; - homepage = "https://github.com/ludios/wpull"; + homepage = "https://github.com/ArchiveTeam/ludios_wpull"; license = lib.licenses.gpl3; maintainers = with lib.maintainers; [ ivan ]; broken = lib.versions.major tornado.version != "4"; diff --git a/pkgs/development/python-modules/mailman-hyperkitty/default.nix b/pkgs/development/python-modules/mailman-hyperkitty/default.nix index 649d8d4cf3d..117ec4fb436 100644 --- a/pkgs/development/python-modules/mailman-hyperkitty/default.nix +++ b/pkgs/development/python-modules/mailman-hyperkitty/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "mailman-hyperkitty"; - version = "1.1.0"; + version = "1.2.0"; format = "setuptools"; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - sha256 = "1lfqa9admhvdv71f528jmz2wl0i5cv77v6l64px2pm4zqr9ckkjx"; + sha256 = "sha256-EQBx1KX3z/Wv3QAHOi+s/ihLOjpiupIQBYyE6IPbJto="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/mujson/default.nix b/pkgs/development/python-modules/mujson/default.nix new file mode 100644 index 00000000000..10f0e40b762 --- /dev/null +++ b/pkgs/development/python-modules/mujson/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "mujson"; + version = "1.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-J9nPGxDkLQje6AkL9cewNqmQ7Z+00TXBEr3p71E2cnE="; + }; + + # LICENSE file missing from src + # https://github.com/mattgiles/mujson/issues/8 + postPatch = '' + substituteInPlace setup.cfg \ + --replace "license_file = LICENSE" "" + ''; + + # No tests + doCheck = false; + pythonImportsCheck = [ "mujson" ]; + + meta = with lib; { + description = "Use the fastest JSON functions available at import time"; + homepage = "https://github.com/mattgiles/mujson"; + license = licenses.mit; + maintainers = with maintainers; [ artturin ]; + }; +} diff --git a/pkgs/development/python-modules/nessclient/default.nix b/pkgs/development/python-modules/nessclient/default.nix new file mode 100644 index 00000000000..d91a80eb9d0 --- /dev/null +++ b/pkgs/development/python-modules/nessclient/default.nix @@ -0,0 +1,47 @@ +{ lib +, asynctest +, buildPythonPackage +, click +, fetchFromGitHub +, justbackoff +, pythonOlder +, pytest-asyncio +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "nessclient"; + version = "0.9.16b2"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "nickw444"; + repo = pname; + rev = version; + sha256 = "1g3q9bv1nn1b8n6bklc05k8pac4cndzfxfr7liky0gnnbri15k81"; + }; + + propagatedBuildInputs = [ + justbackoff + click + ]; + + checkInputs = [ + asynctest + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ + "nessclient" + ]; + + meta = with lib; { + description = "Python implementation/abstraction of the Ness D8x/D16x Serial Interface ASCII protocol"; + homepage = "https://github.com/nickw444/nessclient"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/py-nightscout/default.nix b/pkgs/development/python-modules/py-nightscout/default.nix new file mode 100644 index 00000000000..e633e6ce81b --- /dev/null +++ b/pkgs/development/python-modules/py-nightscout/default.nix @@ -0,0 +1,50 @@ +{ lib +, aiohttp +, aioresponses +, buildPythonPackage +, fetchFromGitHub +, pytest-asyncio +, pytestCheckHook +, python-dateutil +, pythonOlder +, pytz +}: + +buildPythonPackage rec { + pname = "py-nightscout"; + version = "1.3.2"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "marciogranzotto"; + repo = pname; + rev = "v${version}"; + sha256 = "06i8vc7ykk5112y66cjixbrks46mdx3r0ygkmyah6gfgq1ddc39j"; + }; + + propagatedBuildInputs = [ + python-dateutil + pytz + aiohttp + ]; + + checkInputs = [ + aioresponses + pytestCheckHook + pytest-asyncio + ]; + + + pythonImportsCheck = [ + "py_nightscout" + ]; + + meta = with lib; { + description = "Python library that provides an interface to Nightscout"; + homepage = "https://github.com/marciogranzotto/py-nightscout"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pytomlpp/default.nix b/pkgs/development/python-modules/pytomlpp/default.nix index d2fc8470d48..271d193ce01 100644 --- a/pkgs/development/python-modules/pytomlpp/default.nix +++ b/pkgs/development/python-modules/pytomlpp/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "pytomlpp"; - version = "0.3.5"; + version = "1.0.6"; src = fetchFromGitHub { owner = "bobfang1992"; repo = pname; - rev = version; + rev = "v${version}"; fetchSubmodules = true; - sha256 = "1h06a2r0f5q4mml485113mn7a7585zmhqsk2p1apcybyydllcqda"; + sha256 = "sha256-QyjIJCSgiSKjqMBvCbOlWYx6rBbKIoDvXez2YnYaPUo="; }; buildInputs = [ pybind11 ]; diff --git a/pkgs/development/python-modules/sanic/default.nix b/pkgs/development/python-modules/sanic/default.nix index 1f7775c1d84..6161f5c5eb0 100644 --- a/pkgs/development/python-modules/sanic/default.nix +++ b/pkgs/development/python-modules/sanic/default.nix @@ -85,19 +85,14 @@ buildPythonPackage rec { "test_auto_reload" "test_no_exceptions_when_cancel_pending_request" "test_ipv6_address_is_not_wrapped" - ] ++ lib.optionals stdenv.isDarwin [ - # https://github.com/sanic-org/sanic/issues/2298 - "test_no_exceptions_when_cancel_pending_request" - ] ++ lib.optionals (stdenv.hostPlatform.system == "aarch64-linux") [ # These appear to be very sensitive to output of commands - # Output is different on aarch64 - "test_server_run" + "test_access_logs" + "test_auto_reload" "test_host_port" + "test_no_exceptions_when_cancel_pending_request" "test_num_workers" - "test_access_logs" + "test_server_run" "test_version" - # Failing for a different reason than Darwin - "test_no_exceptions_when_cancel_pending_request" ]; # avoid usage of nixpkgs-review in darwin since tests will compete usage diff --git a/pkgs/development/tools/misc/ccache/default.nix b/pkgs/development/tools/misc/ccache/default.nix index 6e6f71b6fbe..10e11391cd3 100644 --- a/pkgs/development/tools/misc/ccache/default.nix +++ b/pkgs/development/tools/misc/ccache/default.nix @@ -15,13 +15,13 @@ let ccache = stdenv.mkDerivation rec { pname = "ccache"; - version = "4.5"; + version = "4.5.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-RRQso5j249PinoWznix4x4/NURe3TrwYlKOF4q8dc5U="; + sha256 = "sha256-AmzfBuase3RDoRVswyIgBnyL5TK0LXEGmYIpDzsCwgs="; }; outputs = [ "out" "man" ]; diff --git a/pkgs/development/tools/misc/creduce/default.nix b/pkgs/development/tools/misc/creduce/default.nix index 0ae900060b9..77493bd1664 100644 --- a/pkgs/development/tools/misc/creduce/default.nix +++ b/pkgs/development/tools/misc/creduce/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "creduce"; - version = "2.9.0"; + version = "2.10.0"; src = fetchurl { url = "https://embed.cs.utah.edu/${pname}/${pname}-${version}.tar.gz"; - sha256 = "1b833z0g1hich68kzbkpfc26xb8w2phfl5savy8c6ir9ihwy1a8w"; + sha256 = "2xwPEjln8k1iCwQM69UwAb89zwPkAPeFVqL/LhH+oGM="; }; nativeBuildInputs = [ cmake makeWrapper llvm.dev ]; diff --git a/pkgs/development/tools/rust/cargo-msrv/default.nix b/pkgs/development/tools/rust/cargo-msrv/default.nix index 18b432df7b4..33e9fca441f 100644 --- a/pkgs/development/tools/rust/cargo-msrv/default.nix +++ b/pkgs/development/tools/rust/cargo-msrv/default.nix @@ -3,10 +3,12 @@ , fetchFromGitHub , nix-update-script , pkg-config +, rustup , openssl , stdenv , libiconv , Security +, makeWrapper }: rustPlatform.buildRustPackage rec { @@ -35,7 +37,12 @@ rustPlatform.buildRustPackage rec { then [ libiconv Security ] else [ openssl ]; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config makeWrapper ]; + + # Depends at run-time on having rustup in PATH + postInstall = '' + wrapProgram $out/bin/cargo-msrv --prefix PATH : ${lib.makeBinPath [ rustup ]}; + ''; meta = with lib; { description = "Cargo subcommand \"msrv\": assists with finding your minimum supported Rust version (MSRV)"; diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index f1107d866cc..f8f892613ba 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -866,8 +866,8 @@ let mktplcRef = { name = "haskell"; publisher = "haskell"; - version = "1.6.1"; - sha256 = "1l6nrbqkq1p62dkmzs4sy0rxbid3qa1104s3fd9fzkmc1sldzgsn"; + version = "1.7.1"; + sha256 = "sha256-UWdj2J5z5cTUsfvlU++LRil0tEiAH2AFb1AwBsfMvoY="; }; meta = with lib; { license = licenses.mit; diff --git a/pkgs/os-specific/linux/plymouth/default.nix b/pkgs/os-specific/linux/plymouth/default.nix index 8cb2a00987e..62950b08525 100644 --- a/pkgs/os-specific/linux/plymouth/default.nix +++ b/pkgs/os-specific/linux/plymouth/default.nix @@ -15,8 +15,8 @@ }: stdenv.mkDerivation rec { - pname = "plymouth-unstable"; - version = "2020-12-07"; + pname = "plymouth"; + version = "unstable-2021-10-18"; outputs = [ "out" @@ -27,8 +27,8 @@ stdenv.mkDerivation rec { domain = "gitlab.freedesktop.org"; owner = "plymouth"; repo = "plymouth"; - rev = "c4ced2a2d70edea7fbb95274aa1d01d95928df1b"; - sha256 = "7CPuKMA0fTt8DBsaA4Td74kHT/O7PW8N3awP04nUnOI="; + rev = "18363cd887dbfe7e82a2f4cc1a49ef9513919142"; + sha256 = "sha256-+AP4ALOFdYFt/8MDXjMaHptkogCwK1iXKuza1zfMaws="; }; nativeBuildInputs = [ @@ -47,15 +47,6 @@ stdenv.mkDerivation rec { systemd ]; - patches = [ - # KillMode=none is deprecated - # https://gitlab.freedesktop.org/plymouth/plymouth/-/issues/123 - (fetchpatch { - url = "https://gitlab.freedesktop.org/plymouth/plymouth/-/commit/b406b0895a95949db2adfedaeda451f36f2b51c3.patch"; - sha256 = "/UBImNuFO0G/oxlttjGIXon8YXMXlc9XU8uVuR9QuxY="; - }) - ]; - postPatch = '' sed -i \ -e "s#plymouthplugindir=.*#plymouthplugindir=/etc/plymouth/plugins/#" \ diff --git a/pkgs/os-specific/linux/powertop/default.nix b/pkgs/os-specific/linux/powertop/default.nix index b8a0487bc7e..2b498d9ddc9 100644 --- a/pkgs/os-specific/linux/powertop/default.nix +++ b/pkgs/os-specific/linux/powertop/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, gettext, libnl, ncurses, pciutils +{ lib, stdenv, fetchFromGitHub, fetchpatch, gettext, libnl, ncurses, pciutils , pkg-config, zlib, autoreconfHook }: stdenv.mkDerivation rec { @@ -12,6 +12,15 @@ stdenv.mkDerivation rec { sha256 = "1zkr2y5nb1nr22nq8a3zli87iyfasfq6489p7h1k428pv8k45w4f"; }; + patches = [ + # Pull upstream patch for ncurses-6.3 compatibility + (fetchpatch { + name = "ncurses-6.3.patch"; + url = "https://github.com/fenrus75/powertop/commit/9ef1559a1582f23d599c149601c3a8e06809296c.patch"; + sha256 = "0qx69f3bwhxgsga9nas8lgrclf1rxvr7fq7fd2n8dv3x4lsb46j1"; + }) + ]; + outputs = [ "out" "man" ]; nativeBuildInputs = [ pkg-config autoreconfHook ]; diff --git a/pkgs/os-specific/linux/tiptop/default.nix b/pkgs/os-specific/linux/tiptop/default.nix index c6870d2a4c4..bb9fa285982 100644 --- a/pkgs/os-specific/linux/tiptop/default.nix +++ b/pkgs/os-specific/linux/tiptop/default.nix @@ -9,11 +9,20 @@ stdenv.mkDerivation rec { sha256 = "10j1138y3cj3hsmfz4w0bmk90523b0prqwi9nhb4z8xvjnf49i2i"; }; - patches = [(fetchpatch { - name = "reproducibility.patch"; - url = "https://salsa.debian.org/debian/tiptop/raw/debian/2.3.1-1/debian/patches/0001-fix-reproducibility-of-build-process.patch"; - sha256 = "116l7n3nl9lj691i7j8x0d0za1i6zpqgghw5d70qfpb17c04cblp"; - })]; + patches = [ + (fetchpatch { + name = "reproducibility.patch"; + url = "https://salsa.debian.org/debian/tiptop/raw/debian/2.3.1-1/debian/patches/0001-fix-reproducibility-of-build-process.patch"; + sha256 = "116l7n3nl9lj691i7j8x0d0za1i6zpqgghw5d70qfpb17c04cblp"; + }) + + # Pull upstream patch for ncurses-6.3 + (fetchpatch { + name = "ncurses-6.3.patch"; + url = "https://gitlab.inria.fr/rohou/tiptop/-/commit/a78234c27fdd62fed09430d998950e49e11a1832.patch"; + sha256 = "1k55agdri7iw3gwm4snj3ps62qzmxlqr6s0868l8qamjw38z9g00"; + }) + ]; postPatch = '' substituteInPlace ./configure --replace -lcurses -lncurses diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 19714e9a33b..1d10fa3f796 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -559,7 +559,7 @@ "nanoleaf" = ps: with ps; [ aionanoleaf ]; "neato" = ps: with ps; [ aiohttp-cors pybotvac ]; "nederlandse_spoorwegen" = ps: with ps; [ nsapi ]; - "ness_alarm" = ps: with ps; [ ]; # missing inputs: nessclient + "ness_alarm" = ps: with ps; [ nessclient ]; "nest" = ps: with ps; [ aiohttp-cors ha-ffmpeg python-nest ]; # missing inputs: google-nest-sdm "netatmo" = ps: with ps; [ pyturbojpeg aiohttp-cors hass-nabucasa pyatmo ]; "netdata" = ps: with ps; [ netdata ]; @@ -572,7 +572,7 @@ "nextbus" = ps: with ps; [ ]; # missing inputs: py_nextbusnext "nextcloud" = ps: with ps; [ nextcloudmonitor ]; "nfandroidtv" = ps: with ps; [ ]; # missing inputs: notifications-android-tv - "nightscout" = ps: with ps; [ ]; # missing inputs: py-nightscout + "nightscout" = ps: with ps; [ py-nightscout ]; "niko_home_control" = ps: with ps; [ niko-home-control ]; "nilu" = ps: with ps; [ niluclient ]; "nissan_leaf" = ps: with ps; [ pycarwings2 ]; @@ -945,7 +945,7 @@ "vivotek" = ps: with ps; [ ]; # missing inputs: libpyvivotek "vizio" = ps: with ps; [ pyvizio ]; "vlc" = ps: with ps; [ python-vlc ]; - "vlc_telnet" = ps: with ps; [ ]; # missing inputs: aiovlc + "vlc_telnet" = ps: with ps; [ aiovlc ]; "voicerss" = ps: with ps; [ ]; "volkszaehler" = ps: with ps; [ volkszaehler ]; "volumio" = ps: with ps; [ pyvolumio ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 7f4c7d65a44..0ee7fcd6b31 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -536,8 +536,10 @@ in with py.pkgs; buildPythonApplication rec { "nam" "namecheapdns" "neato" + "ness_alarm" "netatmo" "nexia" + "nightscout" "no_ip" "notify" "notion" @@ -723,6 +725,7 @@ in with py.pkgs; buildPythonApplication rec { "vesync" "vilfo" "vizio" + "vlc_telnet" "voicerss" "volumio" # disabled, becaused AttributeError: <class 'vultr.vultr.Vultr'> does not have the attribute 'server_list' diff --git a/pkgs/servers/mail/mailman/default.nix b/pkgs/servers/mail/mailman/default.nix index 557a9d54c14..8cd087f4174 100644 --- a/pkgs/servers/mail/mailman/default.nix +++ b/pkgs/servers/mail/mailman/default.nix @@ -1,10 +1,10 @@ -{ lib, python3, fetchPypi, fetchpatch, pythonOlder, postfix, lynx +{ lib, buildPythonPackage, fetchPypi, fetchpatch, pythonOlder, python3, postfix, lynx }: let - py = python3.override { + # Mailman does not support sqlalchemy >= 1.4 https://gitlab.com/mailman/mailman/-/issues/845 + pythonOverride = python3.override { packageOverrides = self: super: { - # https://gitlab.com/mailman/mailman/-/issues/845 sqlalchemy = super.sqlalchemy.overridePythonAttrs (oldAttrs: rec { version = "1.3.24"; src = oldAttrs.src.override { @@ -14,11 +14,8 @@ let }); }; }; - in -with py.pkgs; - buildPythonPackage rec { pname = "mailman"; version = "3.3.5"; @@ -29,7 +26,7 @@ buildPythonPackage rec { sha256 = "12mgxs1ndhdjjkydx48b95na9k9h0disfqgrr6wxx7vda6dqvcwz"; }; - propagatedBuildInputs = [ + propagatedBuildInputs = with pythonOverride.pkgs; [ aiosmtpd alembic authheaders diff --git a/pkgs/servers/mail/mailman/hyperkitty.nix b/pkgs/servers/mail/mailman/hyperkitty.nix index d0d7cbc7fbb..4d4f714e748 100644 --- a/pkgs/servers/mail/mailman/hyperkitty.nix +++ b/pkgs/servers/mail/mailman/hyperkitty.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage -, fetchFromGitLab -, isPy3k +, fetchPypi +, pythonOlder # dependencies , defusedxml @@ -32,18 +32,12 @@ buildPythonPackage rec { pname = "HyperKitty"; # Note: Mailman core must be on the latest version before upgrading HyperKitty. # See: https://gitlab.com/mailman/postorius/-/issues/516#note_544571309 - # - # Update to next stable version > 1.3.4 that has fixed tests, see - # https://gitlab.com/mailman/django-mailman3/-/issues/48 version = "1.3.5"; - disabled = !isPy3k; + disabled = pythonOlder "3.8"; - src = fetchFromGitLab { - domain = "gitlab.com"; - owner = "mailman"; - repo = "hyperkitty"; - rev = version; - sha256 = "0v70r0r6w0q56hk2hw1qp3ci0bwd9x8inf4gai6ybjqjfskqrxi4"; + src = fetchPypi { + inherit pname version; + sha256 = "sha256-gmkiK8pIHfubbbxNdm/D6L2o722FptxYgINYdIUOn4Y="; }; postPatch = '' diff --git a/pkgs/servers/mail/mailman/postorius.nix b/pkgs/servers/mail/mailman/postorius.nix index 57df52d0a0a..4022b6fe91c 100644 --- a/pkgs/servers/mail/mailman/postorius.nix +++ b/pkgs/servers/mail/mailman/postorius.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "postorius"; # Note: Mailman core must be on the latest version before upgrading Postorious. # See: https://gitlab.com/mailman/postorius/-/issues/516#note_544571309 - version = "1.3.5"; + version = "1.3.6"; src = fetchPypi { inherit pname version; - sha256 = "0f23c6542bf0f6e6364d678c094ee5804acfe59ecbcc0e944bc4c13834e24e80"; + sha256 = "sha256-KwzEU9IfcQ6YPZu3jPuFrd6ux/3e2pzoLfTrak/aGmg="; }; propagatedBuildInputs = [ django-mailman3 readme_renderer ]; diff --git a/pkgs/servers/mail/mailman/web.nix b/pkgs/servers/mail/mailman/web.nix index 10adb49be84..c517cb3e4e3 100644 --- a/pkgs/servers/mail/mailman/web.nix +++ b/pkgs/servers/mail/mailman/web.nix @@ -1,24 +1,18 @@ -{ buildPythonPackage, lib, fetchgit, isPy3k -, git, makeWrapper, sassc, hyperkitty, postorius, whoosh, setuptools-scm +{ buildPythonPackage, lib, fetchPypi, pythonOlder +, sassc, hyperkitty, postorius, whoosh, setuptools-scm }: buildPythonPackage rec { pname = "mailman-web"; - version = "unstable-2021-04-10"; - disabled = !isPy3k; - - src = fetchgit { - url = "https://gitlab.com/mailman/mailman-web"; - rev = "19a7abe27dd3bc39c0250440de073f0adecd4da1"; - sha256 = "0h25140n2jaisl0ri5x7gdmbypiys8vlq8dql1zmaxvq459ybxkn"; - leaveDotGit = true; + version = "0.0.5"; + disabled = pythonOlder "3.8"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-9pvs/VATAsMcGNrj58b/LifysEPTNhrAP57sfp4nX6Q="; }; postPatch = '' - # This is just so people installing from pip also get uwsgi - # installed, AFAICT. - sed -i '/^ uwsgi$/d' setup.cfg - # Django is depended on transitively by hyperkitty and postorius, # and mailman_web has overly restrictive version bounds on it, so # let's remove it. @@ -32,16 +26,15 @@ buildPythonPackage rec { --replace /opt/mailman/web /var/lib/mailman-web ''; - nativeBuildInputs = [ git makeWrapper setuptools-scm ]; + nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ hyperkitty postorius whoosh ]; # Tries to check runtime configuration. doCheck = false; - postInstall = '' - wrapProgram $out/bin/mailman-web \ - --suffix PATH : ${lib.makeBinPath [ sassc ]} - ''; + makeWrapperArgs = [ + "--suffix PATH : ${lib.makeBinPath [ sassc ]}" + ]; meta = with lib; { description = "Django project for Mailman 3 web interface"; diff --git a/pkgs/servers/mautrix-facebook/default.nix b/pkgs/servers/mautrix-facebook/default.nix index 2967af52740..b3fdef8698b 100644 --- a/pkgs/servers/mautrix-facebook/default.nix +++ b/pkgs/servers/mautrix-facebook/default.nix @@ -7,13 +7,13 @@ python3.pkgs.buildPythonPackage rec { pname = "mautrix-facebook"; - version = "0.3.1"; + version = "0.3.2"; src = fetchFromGitHub { owner = "mautrix"; repo = "facebook"; rev = "v${version}"; - sha256 = "0m7nznx3z6cg4wgvjybdivx22ifxcdri4i8501yibsri0jnpf0y2"; + sha256 = "1n7gshm2nir6vgjkj36lq9m2bclkgy0y236xi8zvdlvfcb2m596f"; }; propagatedBuildInputs = with python3.pkgs; [ @@ -34,10 +34,6 @@ python3.pkgs.buildPythonPackage rec { doCheck = false; - postPatch = '' - sed -ie 's/^asyncpg.*/asyncpg>=0.20/' requirements.txt - ''; - postInstall = '' mkdir -p $out/bin diff --git a/pkgs/servers/misc/navidrome/default.nix b/pkgs/servers/misc/navidrome/default.nix index 19a89bbbf1c..2bec7f6912e 100644 --- a/pkgs/servers/misc/navidrome/default.nix +++ b/pkgs/servers/misc/navidrome/default.nix @@ -4,17 +4,17 @@ with lib; stdenv.mkDerivation rec { pname = "navidrome"; - version = "0.45.1"; + version = "0.47.0"; src = fetchurl (if stdenv.hostPlatform.system == "x86_64-linux" then { url = "https://github.com/deluan/navidrome/releases/download/v${version}/navidrome_${version}_Linux_x86_64.tar.gz"; - sha256 = "sha256-TZcXq51sKoeLPmcRpv4VILDmS6dsS7lxlJzTDH0tEWM="; + sha256 = "sha256-MoBv2dTCotLnGaZOUWLScYd1+gKSjPXTSkHAR6UircA="; } else { url = "https://github.com/deluan/navidrome/releases/download/v${version}/navidrome_${version}_Linux_arm64.tar.gz"; - sha256 = "sha256-Va0DSmemj8hsaywoP6WKo/x+QQzSNwHCpU4VWs5lpbI="; + sha256 = "sha256-FIjrw+BBJXOjh1AoVdfPZIdcDyk5yS/zKD1O+u31YlE="; }); nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/zookeeper/default.nix b/pkgs/servers/zookeeper/default.nix index becd765fd8d..f00c749557f 100644 --- a/pkgs/servers/zookeeper/default.nix +++ b/pkgs/servers/zookeeper/default.nix @@ -1,5 +1,9 @@ -{ lib, stdenv, fetchurl, jre, makeWrapper, bash, coreutils }: - +{ lib, stdenv, fetchurl, jdk11_headless, makeWrapper, nixosTests, bash, coreutils }: +let + # Latest supported LTS JDK for Zookeeper 3.6: + # https://zookeeper.apache.org/doc/r3.6.3/zookeeperAdmin.html#sc_requiredSoftware + jre = jdk11_headless; +in stdenv.mkDerivation rec { pname = "zookeeper"; version = "3.6.3"; @@ -33,6 +37,10 @@ stdenv.mkDerivation rec { runHook postInstall ''; + passthru.tests = { + nixos = nixosTests.zookeeper; + }; + meta = with lib; { homepage = "https://zookeeper.apache.org"; description = "Apache Zookeeper"; diff --git a/pkgs/shells/oil/default.nix b/pkgs/shells/oil/default.nix index 3d9a2ec24e6..76680c3c3c4 100644 --- a/pkgs/shells/oil/default.nix +++ b/pkgs/shells/oil/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "oil"; - version = "0.9.3"; + version = "0.9.4"; src = fetchurl { url = "https://www.oilshell.org/download/oil-${version}.tar.xz"; - sha256 = "sha256-YvNgcvafM3jgO3nY1SVcHRNglOwRQQ208W7oLxZg79o="; + sha256 = "sha256-+sYbzWtowLvy44aqhLEH8mUYUn1DJr9HOgKq3YXlPQI="; }; postPatch = '' @@ -32,6 +32,7 @@ stdenv.mkDerivation rec { asl20 # Licence for Oil itself ]; + platforms = lib.platforms.all; maintainers = with lib.maintainers; [ lheckemann alva ]; changelog = "https://www.oilshell.org/release/${version}/changelog.html"; }; diff --git a/pkgs/tools/backup/grab-site/default.nix b/pkgs/tools/backup/grab-site/default.nix index 2f2f01356b4..fe6496bf212 100644 --- a/pkgs/tools/backup/grab-site/default.nix +++ b/pkgs/tools/backup/grab-site/default.nix @@ -1,8 +1,15 @@ -{ lib, python37, fetchFromGitHub }: +{ lib, python38, fetchFromGitHub }: let - python = python37.override { + python = python38.override { self = python; packageOverrides = self: super: { + sqlalchemy = super.sqlalchemy.overridePythonAttrs (oldAttrs: rec { + version = "1.3.24"; + src = oldAttrs.src.override { + inherit version; + sha256 = "ebbb777cbf9312359b897bf81ba00dae0f5cb69fba2a18265dcc18a6f5ef7519"; + }; + }); tornado = super.tornado_4; }; }; @@ -10,18 +17,18 @@ let in with python.pkgs; buildPythonApplication rec { pname = "grab-site"; - version = "2.2.0"; + version = "2.2.2"; src = fetchFromGitHub { rev = version; owner = "ArchiveTeam"; repo = "grab-site"; - sha256 = "1jxcv9dral6h7vfpfqkp1yif6plj0vspzakymkj8hfl75nh0wpv8"; + sha256 = "0af53g703kqpxa6bn72mb2l5l0qrjknq5wqwl4wryyscdp4xabx4"; }; postPatch = '' substituteInPlace setup.py \ - --replace '"wpull @ https://github.com/ArchiveTeam/ludios_wpull/tarball/master#egg=wpull-3.0.7"' '"wpull"' + --replace '"wpull @ https://github.com/ArchiveTeam/ludios_wpull/tarball/master#egg=wpull-${ludios_wpull.version}"' '"wpull"' ''; propagatedBuildInputs = [ diff --git a/pkgs/tools/misc/broot/default.nix b/pkgs/tools/misc/broot/default.nix index 9817df780ea..6a8ace3b2a9 100644 --- a/pkgs/tools/misc/broot/default.nix +++ b/pkgs/tools/misc/broot/default.nix @@ -15,14 +15,14 @@ rustPlatform.buildRustPackage rec { pname = "broot"; - version = "1.7.1"; + version = "1.7.3"; src = fetchCrate { inherit pname version; - sha256 = "sha256-Gg60jeDfHNKUYynJRgN4oLWhcdApWUdO5kRwl5hrFMM="; + sha256 = "sha256-qu8COcMuReV8zbDK5lm378SQY+TwDy/lo9T/ldNMfz0="; }; - cargoHash = "sha256-xsTlFfgX3Np3M/RqmK30DZBCrY1OXnEkjqBDI+ffd/U="; + cargoHash = "sha256-ndFymXT2hA4ZztePDFhAYlMh8Iwxi1/ULZYGq+W5vpE="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/tools/misc/gotify-desktop/default.nix b/pkgs/tools/misc/gotify-desktop/default.nix index 350f29ec52b..1da729c706d 100644 --- a/pkgs/tools/misc/gotify-desktop/default.nix +++ b/pkgs/tools/misc/gotify-desktop/default.nix @@ -21,6 +21,6 @@ rustPlatform.buildRustPackage rec { description = "Small Gotify daemon to send messages as desktop notifications"; homepage = "https://github.com/desbma/gotify-desktop"; license = licenses.gpl3Plus; - maintainers = [ maintainers.bryanasdev000 ]; + maintainers = with maintainers; [ bryanasdev000 genofire ]; }; } diff --git a/pkgs/tools/misc/vector/default.nix b/pkgs/tools/misc/vector/default.nix index 9f06c858b48..ab75f4349cc 100644 --- a/pkgs/tools/misc/vector/default.nix +++ b/pkgs/tools/misc/vector/default.nix @@ -28,7 +28,7 @@ let pname = "vector"; - version = "0.17.3"; + version = "0.18.0"; in rustPlatform.buildRustPackage { inherit pname version; @@ -37,10 +37,10 @@ rustPlatform.buildRustPackage { owner = "timberio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-1Z2GtzWkS7cxzCs+RBKMtWbzIIt4aeS1Iy9kMBEeDMw="; + sha256 = "sha256-vkiTvJevslXEF2lDTr2IL2vFBQ+dj1N636Livncsso4="; }; - cargoSha256 = "sha256-UEGdvyRPPh5Kb9+0qFyv8UBFslOKn5/R/ineawFA91w="; + cargoSha256 = "sha256-u7GzqQex5pqU7DuueMfbxMSOpAzd+uLQTZ2laG/aC+4="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ oniguruma openssl protobuf rdkafka zstd ] ++ lib.optionals stdenv.isDarwin [ Security libiconv coreutils CoreServices ]; diff --git a/pkgs/tools/networking/kail/default.nix b/pkgs/tools/networking/kail/default.nix index ae431b329ea..7777c129dbf 100644 --- a/pkgs/tools/networking/kail/default.nix +++ b/pkgs/tools/networking/kail/default.nix @@ -1,27 +1,23 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "kail"; - version = "0.8.0"; + version = "0.15.0"; - goPackagePath = "github.com/boz/kail"; + ldflags = [ + "-s" + "-w" + "-X main.version=${version}" + ]; src = fetchFromGitHub { owner = "boz"; repo = "kail"; rev = "v${version}"; - sha256 = "0ibk7j40pj6f2086qcnwp998wld61d2gvrv7yiy6hlkalhww2pq7"; + sha256 = "0b4abzk8lc5qa04ywkl8b5hb9jmxhyi2dpgbl27gmw81525wjnj7"; }; - # regenerate deps.nix using following steps: - # - # go get -u github.com/boz/kail - # cd $GOPATH/src/github.com/boz/kail - # git checkout <version> - # dep init - # dep2nix - deleteVendor = true; - goDeps = ./deps.nix; + vendorSha256 = "09s7sq23hglcb2rsi9igzql39zs4238f3jfmvxz9a8v41da225np"; meta = with lib; { description = "Kubernetes log viewer"; diff --git a/pkgs/tools/networking/kail/deps.nix b/pkgs/tools/networking/kail/deps.nix deleted file mode 100644 index b6d9c3e9cf3..00000000000 --- a/pkgs/tools/networking/kail/deps.nix +++ /dev/null @@ -1,408 +0,0 @@ -# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) -[ - { - goPackagePath = "cloud.google.com/go"; - fetch = { - type = "git"; - url = "https://code.googlesource.com/gocloud"; - rev = "06f11fffc537c4aef126d9fd3a92e2d7968f118f"; - sha256 = "1zhr1pyzk44zb95r2bcs4kkngvmzdr5bac55315nnzl3adx4y4dn"; - }; - } - { - goPackagePath = "github.com/Azure/go-autorest"; - fetch = { - type = "git"; - url = "https://github.com/Azure/go-autorest"; - rev = "1ff28809256a84bb6966640ff3d0371af82ccba4"; - sha256 = "0sxvj2j1833bqwxvhq3wq3jgq73rnb81pnzvl0x3y1m0hzpaf2zv"; - }; - } - { - goPackagePath = "github.com/alecthomas/template"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/template"; - rev = "a0175ee3bccc567396460bf5acd36800cb10c49c"; - sha256 = "0qjgvvh26vk1cyfq9fadyhfgdj36f1iapbmr5xp6zqipldz8ffxj"; - }; - } - { - goPackagePath = "github.com/alecthomas/units"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/units"; - rev = "2efee857e7cfd4f3d0138cc3cbb1b4966962b93a"; - sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl"; - }; - } - { - goPackagePath = "github.com/boz/go-lifecycle"; - fetch = { - type = "git"; - url = "https://github.com/boz/go-lifecycle"; - rev = "c39961a5a0ce6b046f15d62bcbed79701666a9e0"; - sha256 = "12xzjzgi0pspb28xrcmp4v33jij2bbg609z1kpq1pql9mxs6h31k"; - }; - } - { - goPackagePath = "github.com/boz/go-logutil"; - fetch = { - type = "git"; - url = "https://github.com/boz/go-logutil"; - rev = "9d21a9e4757dbc497f947fe5253f9570c34562fa"; - sha256 = "0rhhyvvz1lvjalv3hx4yvyh90jqfia27nzx9m54m0i7d0znrwpbj"; - }; - } - { - goPackagePath = "github.com/boz/kcache"; - fetch = { - type = "git"; - url = "https://github.com/boz/kcache"; - rev = "a012826955254d3f31548911e75a9dbd817f9470"; - sha256 = "0xqw4mgz0scjrcfsyfwfdhggq1q80dv4mdqgdaryy5ir18srg15l"; - }; - } - { - goPackagePath = "github.com/davecgh/go-spew"; - fetch = { - type = "git"; - url = "https://github.com/davecgh/go-spew"; - rev = "adab96458c51a58dc1783b3335dcce5461522e75"; - sha256 = "1y743w875aqqwggrh4lwlmqyx7ls5m1bnw5y4vr3zps4ib3gb4n5"; - }; - } - { - goPackagePath = "github.com/dgrijalva/jwt-go"; - fetch = { - type = "git"; - url = "https://github.com/dgrijalva/jwt-go"; - rev = "06ea1031745cb8b3dab3f6a236daf2b0aa468b7e"; - sha256 = "08m27vlms74pfy5z79w67f9lk9zkx6a9jd68k3c4msxy75ry36mp"; - }; - } - { - goPackagePath = "github.com/fatih/color"; - fetch = { - type = "git"; - url = "https://github.com/fatih/color"; - rev = "67c513e5729f918f5e69786686770c27141a4490"; - sha256 = "045i2y2h1a6ml7fm1b3if4692320kjgg3cpxn7chlmpq7z1bmrrn"; - }; - } - { - goPackagePath = "github.com/ghodss/yaml"; - fetch = { - type = "git"; - url = "https://github.com/ghodss/yaml"; - rev = "0ca9ea5df5451ffdf184b4428c902747c2c11cd7"; - sha256 = "0skwmimpy7hlh7pva2slpcplnm912rp3igs98xnqmn859kwa5v8g"; - }; - } - { - goPackagePath = "github.com/gogo/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/gogo/protobuf"; - rev = "1c2b16bc280d6635de6c52fc1471ab962dc36ec9"; - sha256 = "0h9vkfy3ydz0d6x72853yg49r9k54cgjnlv6a7v12gzqw47p941i"; - }; - } - { - goPackagePath = "github.com/golang/glog"; - fetch = { - type = "git"; - url = "https://github.com/golang/glog"; - rev = "23def4e6c14b4da8ac2ed8007337bc5eb5007998"; - sha256 = "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30"; - }; - } - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "1909bc2f63dc92bb931deace8b8312c4db72d12f"; - sha256 = "0d4pknkgp5qlbfpw8xp81dqgrfm0na1pfi2ll559nwvjz5vc90g5"; - }; - } - { - goPackagePath = "github.com/google/btree"; - fetch = { - type = "git"; - url = "https://github.com/google/btree"; - rev = "316fb6d3f031ae8f4d457c6c5186b9e3ded70435"; - sha256 = "1fyj10cy2d37mpfk73hjfjwpsgpnmdzf2mrkkvzyx0d41sf46xfd"; - }; - } - { - goPackagePath = "github.com/google/gofuzz"; - fetch = { - type = "git"; - url = "https://github.com/google/gofuzz"; - rev = "24818f796faf91cd76ec7bddd72458fbced7a6c1"; - sha256 = "0cq90m2lgalrdfrwwyycrrmn785rgnxa3l3vp9yxkvnv88bymmlm"; - }; - } - { - goPackagePath = "github.com/googleapis/gnostic"; - fetch = { - type = "git"; - url = "https://github.com/googleapis/gnostic"; - rev = "57b0290873708074edf87ad921eccec8bef5f8ec"; - sha256 = "14raxxsx2bww4f0am0yygv64h950avkswm7bdvq6k4d4lry6dgg8"; - }; - } - { - goPackagePath = "github.com/gophercloud/gophercloud"; - fetch = { - type = "git"; - url = "https://github.com/gophercloud/gophercloud"; - rev = "b4c2377fa77951a0e08163f52dc9b3e206355194"; - sha256 = "00j9ny59zlf3ajwydf2k41n3l92kl2hf0ljx9x73jcfkdkn2xv5k"; - }; - } - { - goPackagePath = "github.com/gregjones/httpcache"; - fetch = { - type = "git"; - url = "https://github.com/gregjones/httpcache"; - rev = "c1f8028e62adb3d518b823a2f8e6a95c38bdd3aa"; - sha256 = "1v7fb4ix2xg0plx5p1f7xd1srvimyss7v7ppn3j7py9ycl560qhr"; - }; - } - { - goPackagePath = "github.com/imdario/mergo"; - fetch = { - type = "git"; - url = "https://github.com/imdario/mergo"; - rev = "e3000cb3d28c72b837601cac94debd91032d19fe"; - sha256 = "1bsz1aj0h266x7g08jj7f3nd3d5islbad0cygb5vh37hjgzirg4d"; - }; - } - { - goPackagePath = "github.com/json-iterator/go"; - fetch = { - type = "git"; - url = "https://github.com/json-iterator/go"; - rev = "ab8a2e0c74be9d3be70b3184d9acc634935ded82"; - sha256 = "1x3wz44p1238gpyzkiiilvvrq9q8dwjdm9kdidq65yjq0zcn0sq4"; - }; - } - { - goPackagePath = "github.com/mattn/go-colorable"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-colorable"; - rev = "6df6d4d004b64986bbb0d1b25945f42b44787e90"; - sha256 = "0ha2biq708is9i3hqc30vihcpajak3qawn0rnacb9k1gyxsxwb60"; - }; - } - { - goPackagePath = "github.com/mattn/go-isatty"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-isatty"; - rev = "fc9e8d8ef48496124e79ae0df75490096eccf6fe"; - sha256 = "1r5f9gkavkb1w6sr0qs5kj16706xirl3qnlq3hqpszkw9w27x65a"; - }; - } - { - goPackagePath = "github.com/modern-go/concurrent"; - fetch = { - type = "git"; - url = "https://github.com/modern-go/concurrent"; - rev = "bacd9c7ef1dd9b15be4a9909b8ac7a4e313eec94"; - sha256 = "0s0fxccsyb8icjmiym5k7prcqx36hvgdwl588y0491gi18k5i4zs"; - }; - } - { - goPackagePath = "github.com/modern-go/reflect2"; - fetch = { - type = "git"; - url = "https://github.com/modern-go/reflect2"; - rev = "94122c33edd36123c84d5368cfb2b69df93a0ec8"; - sha256 = "06a3sablw53n1dqqbr2f53jyksbxdmmk8axaas4yvnhyfi55k4lf"; - }; - } - { - goPackagePath = "github.com/petar/GoLLRB"; - fetch = { - type = "git"; - url = "https://github.com/petar/GoLLRB"; - rev = "53be0d36a84c2a886ca057d34b6aa4468df9ccb4"; - sha256 = "01xp3lcamqkvl91jg6ly202gdsgf64j39rkrcqxi6v4pbrcv7hz0"; - }; - } - { - goPackagePath = "github.com/peterbourgon/diskv"; - fetch = { - type = "git"; - url = "https://github.com/peterbourgon/diskv"; - rev = "5f041e8faa004a95c88a202771f4cc3e991971e6"; - sha256 = "1mxpa5aad08x30qcbffzk80g9540wvbca4blc1r2qyzl65b8929b"; - }; - } - { - goPackagePath = "github.com/pkg/errors"; - fetch = { - type = "git"; - url = "https://github.com/pkg/errors"; - rev = "2b3a18b5f0fb6b4f9190549597d3f962c02bc5eb"; - sha256 = "07fd392kqyaj7fnl4sgzy7fcs0sw4jx3mx2khhgk64n9j9i37l59"; - }; - } - { - goPackagePath = "github.com/pmezard/go-difflib"; - fetch = { - type = "git"; - url = "https://github.com/pmezard/go-difflib"; - rev = "792786c7400a136282c1664665ae0a8db921c6c2"; - sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; - }; - } - { - goPackagePath = "github.com/sirupsen/logrus"; - fetch = { - type = "git"; - url = "https://github.com/sirupsen/logrus"; - rev = "181d419aa9e2223811b824e8f0b4af96f9ba9302"; - sha256 = "08ff47w4clnkym3l0v4hhhfq21zvvwzpljvs0qvki5k0azv7siyc"; - }; - } - { - goPackagePath = "github.com/spf13/pflag"; - fetch = { - type = "git"; - url = "https://github.com/spf13/pflag"; - rev = "e57e3eeb33f795204c1ca35f56c44f83227c6e66"; - sha256 = "13mhx4i913jil32j295m3a36jzvq1y64xig0naadiz7q9ja011r2"; - }; - } - { - goPackagePath = "github.com/stretchr/testify"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/testify"; - rev = "2aa2c176b9dab406a6970f6a55f513e8a8c8b18f"; - sha256 = "1j92x4291flz3i4pk6bi3y59nnsi6lj34zmyfp7axf68fd8vm5ml"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "b176d7def5d71bdd214203491f89843ed217f420"; - sha256 = "1ayi4iagsxhf193rx93j6y2rb48730hgm2qbahiq9lawm5g3vc14"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "1c05540f6879653db88113bc4a2b70aec4bd491f"; - sha256 = "0h8yqb0vcqgllgydrf9d3rzp83w8wlr8f0nm6r1rwf2qg30pq1pd"; - }; - } - { - goPackagePath = "golang.org/x/oauth2"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/oauth2"; - rev = "9a379c6b3e95a790ffc43293c2a78dee0d7b6e20"; - sha256 = "156wff8s9g3sxni2z80wky4v688pvdgfzxbpfp5rmqjvgqnifxkf"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "2d3e384235de683634e9080b58f757466840aa48"; - sha256 = "1w8zrcjv4sfi3skchdbvbixgwzp5n1g0vny8r20dlapnqbazah0x"; - }; - } - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "b19bf474d317b857955b12035d2c5acb57ce8b01"; - sha256 = "0wc8csaafp0ps9jb2hdk8d6xpyw1axhk1np73h0z17x09zk3ylcr"; - }; - } - { - goPackagePath = "golang.org/x/time"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/time"; - rev = "fbb02b2291d28baffd63558aa44b4b56f178d650"; - sha256 = "0jjqcv6rzihlgg4i797q80g1f6ch5diz2kxqh6488gwkb6nds4h4"; - }; - } - { - goPackagePath = "google.golang.org/appengine"; - fetch = { - type = "git"; - url = "https://github.com/golang/appengine"; - rev = "d9a072cfa7b9736e44311ef77b3e09d804bfa599"; - sha256 = "07x7s65q9pydpaniga6zf259kw7qs40q6554wb22inq423wcs0nb"; - }; - } - { - goPackagePath = "gopkg.in/alecthomas/kingpin.v2"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/kingpin"; - rev = "1087e65c9441605df944fb12c33f0fe7072d18ca"; - sha256 = "18llqzkdqf62qbqcv2fd3j0igl6cwwn4dissf5skkvxrcxjcmmj0"; - }; - } - { - goPackagePath = "gopkg.in/inf.v0"; - fetch = { - type = "git"; - url = "https://github.com/go-inf/inf"; - rev = "3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4"; - sha256 = "0rf3vwyb8aqnac9x9d6ax7z5526c45a16yjm2pvkijr6qgqz8b82"; - }; - } - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://github.com/go-yaml/yaml"; - rev = "eb3733d160e74a9c7e442f435eb3bea458e1d19f"; - sha256 = "1srhvcaa9db3a6xj29mkjr5kg33y71pclrlx4vcwz5m1lgb5c7q6"; - }; - } - { - goPackagePath = "k8s.io/api"; - fetch = { - type = "git"; - url = "https://github.com/kubernetes/api"; - rev = "2d6f90ab1293a1fb871cf149423ebb72aa7423aa"; - sha256 = "1cwrwdm104xd3608b1a5mw6a19w45532p647xdwnyn62rw2f08jx"; - }; - } - { - goPackagePath = "k8s.io/apimachinery"; - fetch = { - type = "git"; - url = "https://github.com/kubernetes/apimachinery"; - rev = "103fd098999dc9c0c88536f5c9ad2e5da39373ae"; - sha256 = "04navnpm59d75dhlz07rmay7m2izrf4m0i9xklxzqg7mlk9g20jc"; - }; - } - { - goPackagePath = "k8s.io/client-go"; - fetch = { - type = "git"; - url = "https://github.com/kubernetes/client-go"; - rev = "1f13a808da65775f22cbf47862c4e5898d8f4ca1"; - sha256 = "1vkcjg80l49hxiadqmkkd031kj6kc10m8mwcnla3k1ml8fv4qna9"; - }; - } -] diff --git a/pkgs/tools/networking/ookla-speedtest/default.nix b/pkgs/tools/networking/ookla-speedtest/default.nix index 6f377a0a4bf..3834355528e 100644 --- a/pkgs/tools/networking/ookla-speedtest/default.nix +++ b/pkgs/tools/networking/ookla-speedtest/default.nix @@ -19,7 +19,7 @@ in stdenv.mkDerivation rec { inherit pname version; - src = srcs.${stdenv.hostPlatform.system}; + src = srcs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); setSourceRoot = '' sourceRoot=$PWD diff --git a/pkgs/tools/system/plan9port/default.nix b/pkgs/tools/system/plan9port/default.nix index 6b22dd5fe5c..88c786e30b6 100644 --- a/pkgs/tools/system/plan9port/default.nix +++ b/pkgs/tools/system/plan9port/default.nix @@ -101,7 +101,8 @@ stdenv.mkDerivation { kovirobi ]; platforms = platforms.unix; - broken = stdenv.isDarwin; + # TODO: revisit this when the sdk situation on x86_64-darwin changes + broken = stdenv.isDarwin && stdenv.isx86_64; }; } # TODO: investigate the mouse chording support patch diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 604e3b8c9d1..001d0c5579f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14319,7 +14319,7 @@ with pkgs; credstash = with python3Packages; toPythonApplication credstash; creduce = callPackage ../development/tools/misc/creduce { - inherit (llvmPackages_7) llvm libclang; + inherit (llvmPackages_8) llvm libclang; }; cscope = callPackage ../development/tools/misc/cscope { }; @@ -21639,9 +21639,7 @@ with pkgs; xinetd = callPackage ../servers/xinetd { }; - zookeeper = callPackage ../servers/zookeeper { - jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 - }; + zookeeper = callPackage ../servers/zookeeper { }; zookeeper_mt = callPackage ../development/libraries/zookeeper_mt { }; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 5ba2d5b0643..578803d0da7 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -48,6 +48,7 @@ mapAliases ({ django_taggit = django-taggit; # added 2021-10-11 dns = dnspython; # added 2017-12-10 dogpile_cache = dogpile-cache; # added 2021-10-28 + dogpile-core = throw "dogpile-core is no longer maintained, use dogpile-cache instead"; # added 2021-11-20 faulthandler = throw "faulthandler is built into ${python.executable}"; # added 2021-07-12 gitdb2 = throw "gitdb2 has been deprecated, use gitdb instead."; # added 2020-03-14 glances = throw "glances has moved to pkgs.glances"; # added 2020-20-28 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9229deff1af..575524df518 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -399,6 +399,8 @@ in { aiounittest = callPackage ../development/python-modules/aiounittest { }; + aiovlc = callPackage ../development/python-modules/aiovlc { }; + aiowatttime = callPackage ../development/python-modules/aiowatttime { }; aiowinreg = callPackage ../development/python-modules/aiowinreg { }; @@ -2299,8 +2301,6 @@ in { dogpile-cache = callPackage ../development/python-modules/dogpile-cache { }; - dogpile-core = callPackage ../development/python-modules/dogpile-core { }; - dogtail = callPackage ../development/python-modules/dogtail { }; doit = callPackage ../development/python-modules/doit { }; @@ -4107,6 +4107,8 @@ in { jupytext = callPackage ../development/python-modules/jupytext { }; + justbackoff = callPackage ../development/python-modules/justbackoff { }; + jwcrypto = callPackage ../development/python-modules/jwcrypto { }; jxmlease = callPackage ../development/python-modules/jxmlease { }; @@ -4974,6 +4976,8 @@ in { mutf8 = callPackage ../development/python-modules/mutf8 { }; + mujson = callPackage ../development/python-modules/mujson { }; + mwclient = callPackage ../development/python-modules/mwclient { }; mwdblib = callPackage ../development/python-modules/mwdblib { }; @@ -5072,6 +5076,8 @@ in { neo = callPackage ../development/python-modules/neo { }; + nessclient = callPackage ../development/python-modules/nessclient { }; + nest-asyncio = callPackage ../development/python-modules/nest-asyncio { }; nestedtext = callPackage ../development/python-modules/nestedtext { }; @@ -6125,6 +6131,8 @@ in { py-dmidecode = callPackage ../development/python-modules/py-dmidecode { }; + py-nightscout = callPackage ../development/python-modules/py-nightscout { }; + py-synologydsm-api = callPackage ../development/python-modules/py-synologydsm-api { }; py-ubjson = callPackage ../development/python-modules/py-ubjson { }; |