diff options
32 files changed, 536 insertions, 360 deletions
diff --git a/nixos/modules/services/networking/pleroma.nix b/nixos/modules/services/networking/pleroma.nix index 188598ea7b869..f317510258ba5 100644 --- a/nixos/modules/services/networking/pleroma.nix +++ b/nixos/modules/services/networking/pleroma.nix @@ -141,6 +141,8 @@ in { NoNewPrivileges = true; CapabilityBoundingSet = "~CAP_SYS_ADMIN"; }; + # disksup requires bash + path = [ pkgs.bash ]; }; }; diff --git a/pkgs/applications/audio/faust/faust2.nix b/pkgs/applications/audio/faust/faust2.nix index 19468b3af3454..d1dd74a35ddeb 100644 --- a/pkgs/applications/audio/faust/faust2.nix +++ b/pkgs/applications/audio/faust/faust2.nix @@ -20,13 +20,13 @@ with lib.strings; let - version = "2.41.1"; + version = "2.54.9"; src = fetchFromGitHub { owner = "grame-cncm"; repo = "faust"; rev = version; - sha256 = "sha256-x0nBWyILrNJijs7CIvRrgYG6vgB3UlxLj9i7E4cHr9I="; + sha256 = "sha256-7eSZUsZ0h0vWJIpZWXaS+SHV6N2i9nv6Gr6a9cuu4Fg="; fetchSubmodules = true; }; diff --git a/pkgs/applications/audio/faust/faustlive.nix b/pkgs/applications/audio/faust/faustlive.nix index 87f2920c200b5..b393041eeb12f 100644 --- a/pkgs/applications/audio/faust/faustlive.nix +++ b/pkgs/applications/audio/faust/faustlive.nix @@ -5,12 +5,12 @@ stdenv.mkDerivation rec { pname = "faustlive"; - version = "2.5.12"; + version = "2.5.13"; src = fetchFromGitHub { owner = "grame-cncm"; repo = "faustlive"; rev = version; - sha256 = "sha256-pq9zO4opCh9GEEtuQjrxKdNvOasDlcGGUsQD4je7Wyw="; + sha256 = "sha256-Tgb9UYj8mI4JsxA/PaTokm2NzQ14P8cOdKK8KCcnSIQ="; fetchSubmodules = true; }; diff --git a/pkgs/applications/audio/faustPhysicalModeling/default.nix b/pkgs/applications/audio/faustPhysicalModeling/default.nix index 720bc1613b1db..bc28a2238b84d 100644 --- a/pkgs/applications/audio/faustPhysicalModeling/default.nix +++ b/pkgs/applications/audio/faustPhysicalModeling/default.nix @@ -1,13 +1,13 @@ { stdenv, lib, fetchFromGitHub, faust2jaqt, faust2lv2 }: stdenv.mkDerivation rec { pname = "faustPhysicalModeling"; - version = "2.50.6"; + version = "2.54.9"; src = fetchFromGitHub { owner = "grame-cncm"; repo = "faust"; rev = version; - sha256 = "sha256-Q/vrm3WPsjkE3Xf/XEirsJPFXHNSW/Ve3Jbi/5nIrx8="; + sha256 = "sha256-1ZS7SVTWI1vNOGycZIDyKLgwfNooIGDa8Wmr6qfFSkU="; }; buildInputs = [ faust2jaqt faust2lv2 ]; diff --git a/pkgs/applications/audio/lsp-plugins/default.nix b/pkgs/applications/audio/lsp-plugins/default.nix index f53f4c972af8f..be841577ad79b 100644 --- a/pkgs/applications/audio/lsp-plugins/default.nix +++ b/pkgs/applications/audio/lsp-plugins/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "lsp-plugins"; - version = "1.2.3"; + version = "1.2.4"; src = fetchurl { url = "https://github.com/sadko4u/${pname}/releases/download/${version}/${pname}-src-${version}.tar.gz"; - sha256 = "sha256-ej8t3xk29VLJMO1lvXuzUlD00al8TTkPLL8z62fmTys="; + sha256 = "sha256-GTrcUy10bN9Xj2I7uuGyP82c6NVpnQbXTI85H231yyo="; }; nativeBuildInputs = [ pkg-config php makeWrapper ]; diff --git a/pkgs/applications/audio/x42-plugins/default.nix b/pkgs/applications/audio/x42-plugins/default.nix index a1613946150bc..e4cbfacedc0bb 100644 --- a/pkgs/applications/audio/x42-plugins/default.nix +++ b/pkgs/applications/audio/x42-plugins/default.nix @@ -3,12 +3,12 @@ , libGLU, lv2, gtk2, cairo, pango, fftwFloat, zita-convolver }: stdenv.mkDerivation rec { - version = "20220923"; + version = "20221119"; pname = "x42-plugins"; src = fetchurl { url = "https://gareus.org/misc/x42-plugins/${pname}-${version}.tar.xz"; - sha256 = "sha256-9Y9up5Ziipm6ums1wESfcADKgMwas2SESgGPn74RTt4="; + sha256 = "sha256-q5RiEzV2QKNWXP8KB6nQjyNCTftiYgeowcbD709PEIk="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index 19d656461471b..a9e14f0bfccb0 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -15,11 +15,11 @@ let archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "07njvkgashg9mbkdf7cw40xdxh08qs8gbgh24gdznvs397bvk2jk"; - x86_64-darwin = "155f7rbyb413igvxddrrad0y1s7i9rfldm6d9fvbyz6p8nzyqfvh"; - aarch64-linux = "08wz44js381hjlnpssd09i2xz9min603n7a5v3x2sah4z9vi220d"; - aarch64-darwin = "0ikw0kcbvjwn6b0ac5zfp0shavay31yfhn000xrw9il3py741x7k"; - armv7l-linux = "1pvybhaf96ayjl832vz9c0y2m07mb5a16c2hr13l0vw52sbl30md"; + x86_64-linux = "0xbwx218dzf9nyjf531sb9ij0p8lz08yi09yz8dms07qcsfirac0"; + x86_64-darwin = "028i7cbh43ivz5amx015v0d87kh4jj54b3ndirxl57py2gxszy0x"; + aarch64-linux = "1rg67sfp3abpcxrl89db6x3a41la63xinl4kjin8v08w5iprrm0n"; + aarch64-darwin = "0zm057rvabd29ay88l0h40adrc71p9cjvml34aci58klaqd2if0q"; + armv7l-linux = "0amxgq98gifcjr9wfx8ddcjqkb1b6pr5q3dwfdbyynksqqd4hrxv"; }.${system} or throwSystem; sourceRoot = if stdenv.isDarwin then "" else "."; @@ -29,7 +29,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.74.1.22349"; + version = "1.74.2.22355"; pname = "vscodium"; executableName = "codium"; diff --git a/pkgs/applications/networking/cluster/kyverno/default.nix b/pkgs/applications/networking/cluster/kyverno/default.nix index f0bc32f9be39a..53da8b9be29fd 100644 --- a/pkgs/applications/networking/cluster/kyverno/default.nix +++ b/pkgs/applications/networking/cluster/kyverno/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kyverno"; - version = "1.8.4"; + version = "1.8.5"; src = fetchFromGitHub { owner = "kyverno"; repo = "kyverno"; rev = "v${version}"; - sha256 = "sha256-VAKT1gw8wkfde/rQVvRzq4HH0mKcLczR5EHtxy3zULg="; + sha256 = "sha256-oEy1SNlYHDuZG2urbXEfROwzfNzdbu0Yjsq98Dw+Mws="; }; ldflags = [ diff --git a/pkgs/development/libraries/oneDNN/default.nix b/pkgs/development/libraries/oneDNN/default.nix index a5f15e38740a0..f5e5a2e03d2cc 100644 --- a/pkgs/development/libraries/oneDNN/default.nix +++ b/pkgs/development/libraries/oneDNN/default.nix @@ -5,13 +5,13 @@ # https://github.com/oneapi-src/oneDNN#oneapi-deep-neural-network-library-onednn stdenv.mkDerivation rec { pname = "oneDNN"; - version = "3.0"; + version = "2.7.1"; src = fetchFromGitHub { owner = "oneapi-src"; repo = "oneDNN"; rev = "v${version}"; - sha256 = "sha256-rhuu2C1etU3IHaLSvUiJKMwgnPpcm1g40xjwDprc2LU="; + sha256 = "sha256-HBCuSZkApd/6UkAxz/KDFb/gyX2SI1S2GwgXAXSTU/c="; }; outputs = [ "out" "dev" "doc" ]; diff --git a/pkgs/development/libraries/science/benchmark/papi/default.nix b/pkgs/development/libraries/science/benchmark/papi/default.nix index d4610d60415b7..06dc203aa2fb0 100644 --- a/pkgs/development/libraries/science/benchmark/papi/default.nix +++ b/pkgs/development/libraries/science/benchmark/papi/default.nix @@ -3,12 +3,12 @@ }: stdenv.mkDerivation rec { - version = "6.0.0.1"; + version = "7.0.0"; pname = "papi"; src = fetchurl { url = "https://bitbucket.org/icl/papi/get/papi-${lib.replaceStrings ["."] ["-"] version}-t.tar.gz"; - sha256 = "1jd67yadyffzxwsqlylsi0bx8ishb0cgj2ziz1wdslaz6ylvyf9j"; + sha256 = "sha256-MxiOzfBxLmzsUg4jo2VHThyGE0/WYD3ZEBrq3WRjXGU="; }; setSourceRoot = '' diff --git a/pkgs/development/python-modules/boltztrap2/default.nix b/pkgs/development/python-modules/boltztrap2/default.nix index ae467123e9bc7..04cf75a76d1fc 100644 --- a/pkgs/development/python-modules/boltztrap2/default.nix +++ b/pkgs/development/python-modules/boltztrap2/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "boltztrap2"; - version = "22.6.1"; + version = "22.12.1"; format = "setuptools"; disabled = pythonOlder "3.5"; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "BoltzTraP2"; inherit version; - hash = "sha256-zEKRsNg5P+KKQCeB49TiiSXRmusvr1zwssHhppZdkfA="; + hash = "sha256-gzjWAMUJcF5AyDS1Qx7opVbYewaqGgmFMDGWCh/2Wz4="; }; dontUseCmakeConfigure = true; diff --git a/pkgs/development/python-modules/dparse2/default.nix b/pkgs/development/python-modules/dparse2/default.nix index d3b61574cf8a0..2fbb2e1f3f722 100644 --- a/pkgs/development/python-modules/dparse2/default.nix +++ b/pkgs/development/python-modules/dparse2/default.nix @@ -4,13 +4,13 @@ , pythonOlder , toml , pyyaml -, packaging +, packvers , pytestCheckHook }: buildPythonPackage rec { pname = "dparse2"; - version = "0.6.1"; + version = "0.7.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,14 +18,14 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "nexB"; repo = pname; - rev = version; - hash = "sha256-1tbNW7Gy7gvMnETdAM2ahHiwbhG9qvdYZggia1+7eGo="; + rev = "refs/tags/${version}"; + hash = "sha256-JUTL+SVf1RRIXQqwFR7MnExsgGseSiO0a5YzzcqdXHw="; }; propagatedBuildInputs = [ toml pyyaml - packaging + packvers ]; checkInputs = [ @@ -44,6 +44,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module to parse Python dependency files"; homepage = "https://github.com/nexB/dparse2"; + changelog = "https://github.com/nexB/dparse2/blob/${version}/CHANGELOG.rst"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/nibe/default.nix b/pkgs/development/python-modules/nibe/default.nix index 09188adba6250..329aa4d2d0ef2 100644 --- a/pkgs/development/python-modules/nibe/default.nix +++ b/pkgs/development/python-modules/nibe/default.nix @@ -5,6 +5,7 @@ , async-timeout , buildPythonPackage , construct +, exceptiongroup , fetchFromGitHub , pytest-asyncio , pytestCheckHook @@ -15,7 +16,7 @@ buildPythonPackage rec { pname = "nibe"; - version = "1.5.0"; + version = "1.6.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -24,7 +25,7 @@ buildPythonPackage rec { owner = "yozik04"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-X2WcyBjJbS2WuaaYeBpWM+Tw4mmFOjNX/s070u8LN/4="; + hash = "sha256-6pQsVGb26FpoV2LgOrs+Cfq2rATRqbljrVJ+NsZUSuc="; }; nativeBuildInputs = [ @@ -35,6 +36,7 @@ buildPythonPackage rec { async-modbus async-timeout construct + exceptiongroup tenacity ]; diff --git a/pkgs/development/python-modules/opensensemap-api/default.nix b/pkgs/development/python-modules/opensensemap-api/default.nix index 56edc136c44f3..4cce64c43008d 100644 --- a/pkgs/development/python-modules/opensensemap-api/default.nix +++ b/pkgs/development/python-modules/opensensemap-api/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "opensensemap-api"; - version = "0.2.0"; + version = "0.3.0"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - sha256 = "sha256-KSukSPpSbfbEEqTq4zqqo8OT7ptdPrGy2QyQYjErQWI="; + hash = "sha256-lz2G7vXUadhTFgfHpIq9kHfojf+iytjitFZZ7rgqeO8="; }; propagatedBuildInputs = [ @@ -23,7 +23,7 @@ buildPythonPackage rec { async-timeout ]; - # no tests are present + # Module has no tests doCheck = false; pythonImportsCheck = [ @@ -37,6 +37,7 @@ buildPythonPackage rec { available information from the sensor can be retrieved. ''; homepage = "https://github.com/home-assistant-ecosystem/python-opensensemap-api"; + changelog = "https://github.com/home-assistant-ecosystem/python-opensensemap-api/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/packvers/default.nix b/pkgs/development/python-modules/packvers/default.nix new file mode 100644 index 0000000000000..aae2c0246362f --- /dev/null +++ b/pkgs/development/python-modules/packvers/default.nix @@ -0,0 +1,44 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pretend +, pyparsing +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "packvers"; + version = "21.5"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "nexB"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-nCSYL0g7mXi9pGFt24pOXbmmYsaRuB+rRZrygf8DTLE="; + }; + + propagatedBuildInputs = [ + pyparsing + ]; + + checkInputs = [ + pretend + pytestCheckHook + ]; + + pythonImportsCheck = [ + "packvers" + ]; + + meta = with lib; { + description = "Module for version handling of modules"; + homepage = "https://github.com/nexB/dparse2"; + changelog = "https://github.com/nexB/packvers/blob/${version}/CHANGELOG.rst"; + license = with licenses; [ asl20 /* and */ bsd2 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pyswitchbot/default.nix b/pkgs/development/python-modules/pyswitchbot/default.nix index ae9f670609bd1..8100fcea5157b 100644 --- a/pkgs/development/python-modules/pyswitchbot/default.nix +++ b/pkgs/development/python-modules/pyswitchbot/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pyswitchbot"; - version = "0.30.0"; + version = "0.30.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "pySwitchbot"; rev = "refs/tags/${version}"; - hash = "sha256-OrfCDPE0BGkARgfa6up985+NlF511tUBitsa5TJDUFI="; + hash = "sha256-5Rn1hQ1TZhRiCJGJCaA1sl+HnerL/oOhRdMiSl1Recg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/screenlogicpy/default.nix b/pkgs/development/python-modules/screenlogicpy/default.nix index ca137888ce7cf..a31286d7a3fcd 100644 --- a/pkgs/development/python-modules/screenlogicpy/default.nix +++ b/pkgs/development/python-modules/screenlogicpy/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "screenlogicpy"; - version = "0.5.5"; + version = "0.6.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "dieselrabbit"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-1tBr7k7RutCHvea/56J7drl9P+WZ5bQpDeQwhgktc1s="; + hash = "sha256-/ePvq+jFLiIsP1w9YxMl3lbekNRaDhKMjKXoYkCOpn8="; }; checkInputs = [ @@ -41,6 +41,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python interface for Pentair Screenlogic devices"; homepage = "https://github.com/dieselrabbit/screenlogicpy"; + changelog = "https://github.com/dieselrabbit/screenlogicpy/releases/tag/v${version}"; license = with licenses; [ gpl3Only ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/skodaconnect/default.nix b/pkgs/development/python-modules/skodaconnect/default.nix index f3997a73556db..479655b3b70a9 100644 --- a/pkgs/development/python-modules/skodaconnect/default.nix +++ b/pkgs/development/python-modules/skodaconnect/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "skodaconnect"; - version = "1.1.27"; + version = "1.2.2"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -20,8 +20,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "lendy007"; repo = pname; - rev = "refs/tags/v${version}"; - hash = "sha256-CK5u2Nx1Z7XPDL5W24XxYCo3GfMYCAqKwxpQ8QTfQ0o="; + rev = "refs/tags/${version}"; + hash = "sha256-pBCeOp71A0uksSv4N50ZXAZeg72mT5FC4Toad/1Yc0Y="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -55,7 +55,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module to communicate with Skoda Connect"; homepage = "https://github.com/lendy007/skodaconnect"; - changelog = "https://github.com/lendy007/skodaconnect/releases/tag/v${version}"; + changelog = "https://github.com/lendy007/skodaconnect/releases/tag/${version}"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/supervisor/default.nix b/pkgs/development/python-modules/supervisor/default.nix index 9af3db2de4908..97492250dc4d6 100644 --- a/pkgs/development/python-modules/supervisor/default.nix +++ b/pkgs/development/python-modules/supervisor/default.nix @@ -1,31 +1,46 @@ -{ stdenv, lib, buildPythonPackage, fetchPypi +{ lib +, stdenv +, buildPythonPackage +, fetchPypi , mock -, pytest +, pytestCheckHook +, pythonOlder , setuptools }: buildPythonPackage rec { pname = "supervisor"; - version = "4.2.4"; + version = "4.2.5"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "40dc582ce1eec631c3df79420b187a6da276bbd68a4ec0a8f1f123ea616b97a2"; + sha256 = "sha256-NHYbrhojxYGSKBpRFfsH+/IsmwEzwIFmvv/HD+0+vBI="; }; + propagatedBuildInputs = [ + setuptools + ]; + # wants to write to /tmp/foo which is likely already owned by another # nixbld user on hydra doCheck = !stdenv.isDarwin; - checkInputs = [ mock pytest ]; - checkPhase = '' - pytest - ''; - propagatedBuildInputs = [ setuptools ]; + checkInputs = [ + mock + pytestCheckHook + ]; + + pythonImportsCheck = [ + "supervisor" + ]; meta = with lib; { description = "A system for controlling process state under UNIX"; homepage = "http://supervisord.org/"; + changelog = "https://github.com/Supervisor/supervisor/blob/${version}/CHANGES.rst"; license = licenses.free; # http://www.repoze.org/LICENSE.txt maintainers = with maintainers; [ zimbatm ]; }; diff --git a/pkgs/development/python-modules/yalexs-ble/default.nix b/pkgs/development/python-modules/yalexs-ble/default.nix index a84ba321ab21b..11f2a9573bbf2 100644 --- a/pkgs/development/python-modules/yalexs-ble/default.nix +++ b/pkgs/development/python-modules/yalexs-ble/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "yalexs-ble"; - version = "1.12.2"; + version = "1.12.5"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-QVZlf7t925RFVNBxOj39Ln7sezTkwQ065sbVFcoQG4Y="; + hash = "sha256-wofdqwgMbwxUgUVwBT44qbD4m0q0CtmGH7AxRNMBMbE="; }; nativeBuildInputs = [ diff --git a/pkgs/servers/http/apache-modules/mod_python/default.nix b/pkgs/servers/http/apache-modules/mod_python/default.nix index 1b8ef94fae95c..1b7a7c31d4beb 100644 --- a/pkgs/servers/http/apache-modules/mod_python/default.nix +++ b/pkgs/servers/http/apache-modules/mod_python/default.nix @@ -1,36 +1,32 @@ -{ lib, stdenv, fetchurl, apacheHttpd, python2, libintl }: +{ lib, stdenv, fetchFromGitHub, apacheHttpd, python3, libintl }: stdenv.mkDerivation rec { pname = "mod_python"; - version = "3.5.0"; + version = "unstable-2022-10-18"; - src = fetchurl { - url = "http://dist.modpython.org/dist/${pname}-${version}.tgz"; - sha256 = "146apll3yfqk05s8fkf4acmxzqncl08bgn4rv0c1rd4qxmc91w0f"; + src = fetchFromGitHub { + owner = "grisha"; + repo = pname; + rev = "d066b07564d2194839eceb535485eb1ba0c292d8"; + hash = "sha256-EH8wrXqUAOFWyPKfysGeiIezgrVc789RYO4AHeSA6t4="; }; patches = [ ./install.patch ]; - postPatch = '' - substituteInPlace dist/version.sh \ - --replace 'GIT=`git describe --always`' "" \ - --replace '-$GIT' "" - ''; - - installFlags = [ "LIBEXECDIR=${placeholder "out"}/modules" ]; - - preInstall = '' - mkdir -p $out/modules $out/bin - ''; + installFlags = [ + "LIBEXECDIR=$(out)/modules" + "BINDIR=$(out)/bin" + ]; passthru = { inherit apacheHttpd; }; - buildInputs = [ apacheHttpd python2 ] + buildInputs = [ apacheHttpd python3 ] ++ lib.optional stdenv.isDarwin libintl; - meta = { + meta = with lib; { homepage = "http://modpython.org/"; description = "An Apache module that embeds the Python interpreter within the server"; - platforms = lib.platforms.unix; + platforms = platforms.unix; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/servers/http/apache-modules/mod_wsgi/default.nix b/pkgs/servers/http/apache-modules/mod_wsgi/default.nix index 7185b1c81270a..497cc5b1ea0ae 100644 --- a/pkgs/servers/http/apache-modules/mod_wsgi/default.nix +++ b/pkgs/servers/http/apache-modules/mod_wsgi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, apacheHttpd, python, ncurses }: +{ lib, stdenv, fetchFromGitHub, apacheHttpd, python3, ncurses }: stdenv.mkDerivation rec { pname = "mod_wsgi"; @@ -11,14 +11,16 @@ stdenv.mkDerivation rec { hash = "sha256-6rRHdgdTb94kqIpWJOJOwoIsaXb/c4XY3q331GwQyf0="; }; - buildInputs = [ apacheHttpd python ncurses ]; + buildInputs = [ apacheHttpd python3 ncurses ]; - patchPhase = '' - sed -r -i -e "s|^LIBEXECDIR=.*$|LIBEXECDIR=$out/modules|" \ - ${if stdenv.isDarwin then "-e 's|/usr/bin/lipo|lipo|'" else ""} \ - configure + postPatch = '' + substituteInPlace configure --replace '/usr/bin/lipo' 'lipo' ''; + makeFlags = [ + "LIBEXECDIR=$(out)/modules" + ]; + meta = { homepage = "https://github.com/GrahamDumpleton/mod_wsgi"; description = "Host Python applications in Apache through the WSGI interface"; diff --git a/pkgs/servers/pleroma/default.nix b/pkgs/servers/pleroma/default.nix index 233cafcc9e3cc..5503a6a78f33a 100644 --- a/pkgs/servers/pleroma/default.nix +++ b/pkgs/servers/pleroma/default.nix @@ -1,5 +1,5 @@ { lib, beamPackages -, fetchFromGitHub, fetchFromGitLab +, fetchFromGitHub, fetchFromGitLab, fetchHex , file, cmake , libxcrypt , nixosTests, writeText @@ -8,14 +8,14 @@ beamPackages.mixRelease rec { pname = "pleroma"; - version = "2.4.4"; + version = "2.5.0"; src = fetchFromGitLab { domain = "git.pleroma.social"; owner = "pleroma"; repo = "pleroma"; rev = "v${version}"; - sha256 = "sha256-0I1Hh2KDpUsjRe/qwIWhQBMWPr/c2RkUQk/Mxti+6ZU="; + sha256 = "sha256-Pry3eEUvrGUXK+x4et7DMbSxz9Mh/o5L0/Mh728mv1U="; }; stripDebug = false; @@ -24,17 +24,26 @@ beamPackages.mixRelease rec { overrides = (final: prev: { # mix2nix does not support git dependencies yet, # so we need to add them manually + gettext = beamPackages.buildMix rec { + name = "gettext"; + version = "0.19.1"; + + src = fetchFromGitHub { + owner = "tusooa"; + repo = "gettext"; + rev = "72fb2496b6c5280ed911bdc3756890e7f38a4808"; + sha256 = "sha256-V0qmE+LcAbVoWsJmWE4fwrduYFIZ5BzK/sGzgLY3eH0="; + }; + }; prometheus_ex = beamPackages.buildMix rec { name = "prometheus_ex"; version = "3.0.5"; - src = fetchFromGitLab { - domain = "git.pleroma.social"; - group = "pleroma"; - owner = "elixir-libraries"; + src = fetchFromGitHub { + owner = "lanodan"; repo = "prometheus.ex"; - rev = "a4e9beb3c1c479d14b352fd9d6dd7b1f6d7deee5"; - sha256 = "1v0q4bi7sb253i8q016l7gwlv5562wk5zy3l2sa446csvsacnpjk"; + rev = "31f7fbe4b71b79ba27efc2a5085746c4011ceb8f"; + sha256 = "sha256-2PZP+YnwnHt69HtIAQvjMBqBbfdbkRSoMzb1AL2Zsyc="; }; beamDeps = with final; [ prometheus ]; }; @@ -68,20 +77,6 @@ beamPackages.mixRelease rec { }; beamDeps = with final; [ combine plug inet_cidr ]; }; - concurrent_limiter = beamPackages.buildMix rec { - name = "concurrent_limiter"; - version = "0.1.0"; - - src = fetchFromGitLab { - domain = "git.pleroma.social"; - group = "pleroma"; - owner = "elixir-libraries"; - repo = "concurrent_limiter"; - rev = "d81be41024569330f296fc472e24198d7499ba78"; - sha256 = "1nci8zz1gy7dnvxf5ydjqbagf4g9f7z5x1v9kdyy7jz9f37z6qw9"; - }; - beamDeps = with final; [ telemetry ]; - }; prometheus_phx = beamPackages.buildMix rec { name = "prometheus_phx"; version = "0.1.1"; @@ -99,36 +94,18 @@ beamPackages.mixRelease rec { }; beamDeps = with final; [ prometheus_ex ]; }; - majic = beamPackages.buildMix rec { - name = "majic"; - version = "1.0.0"; - - src = fetchFromGitLab { - domain = "git.pleroma.social"; - group = "pleroma"; - owner = "elixir-libraries"; - repo = "majic"; - rev = "289cda1b6d0d70ccb2ba508a2b0bd24638db2880"; - sha256 = "15605lsdd74bmsp5z96f76ihn7m2g3p1hjbhs2x7v7309n1k108n"; - }; - patchPhase = '' - substituteInPlace lib/majic/server.ex --replace "erlang.now" "erlang.time" - ''; + majic = prev.majic.override { buildInputs = [ file ]; - - beamDeps = with final; [ nimble_pool mime plug elixir_make ]; }; crypt = beamPackages.buildRebar3 rec { name = "crypt"; - version = "0.4.3"; + version = "1.0.0"; - src = fetchFromGitLab { - domain = "git.pleroma.social"; - group = "pleroma"; - owner = "elixir-libraries"; + src = fetchFromGitHub { + owner = "msantos"; repo = "crypt"; - rev = "cf2aa3f11632e8b0634810a15b3e612c7526f6a3"; - sha256 = "sha256-48QIsgyEaDzvnihdsFy7pYURLFcb9G8DXIrf5Luk3zo="; + rev = "f75cd55325e33cbea198fb41fe41871392f8fb76"; + sha256 = "sha256-ZYhZTe7cTITkl8DZ4z2IOlxTX5gnbJImu/lVJ2ZjR1o="; }; postInstall = "mv $out/lib/erlang/lib/crypt-${version}/priv/{source,crypt}.so"; @@ -137,17 +114,6 @@ beamPackages.mixRelease rec { buildInputs = [ libxcrypt ]; }; - web_push_encryption = beamPackages.buildMix rec { - name = "web_push_encryption"; - version = "0.3.0"; - src = fetchFromGitHub { - owner = "lanodan"; - repo = "elixir-web-push-encryption"; - rev = "026a043037a89db4da8f07560bc8f9c68bcf0cc0"; - sha256 = "0a4x6njqp8v579bc965c9ipsr1z3klrc0pvgj8x1xf69r77gs6sj"; - }; - beamDeps = with final; [ httpoison jose ]; - }; # Some additional build inputs and build fixes http_signatures = prev.http_signatures.override { @@ -182,6 +148,19 @@ beamPackages.mixRelease rec { beamDeps = with final; [ p1_utils ]; }; + # Required by eimp + p1_utils = beamPackages.buildRebar3 rec { + name = "p1_utils"; + version = "1.0.18"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "120znzz0yw1994nk6v28zql9plgapqpv51n9g6qm6md1f4x7gj0z"; + }; + + beamDeps = []; + }; mime = prev.mime.override { patchPhase = let diff --git a/pkgs/servers/pleroma/mix.nix b/pkgs/servers/pleroma/mix.nix index 4f57f0eadfbdf..9bd4619bd795e 100644 --- a/pkgs/servers/pleroma/mix.nix +++ b/pkgs/servers/pleroma/mix.nix @@ -34,19 +34,6 @@ let beamDeps = [ custom_base ]; }; - base64url = buildRebar3 rec { - name = "base64url"; - version = "0.0.1"; - - src = fetchHex { - pkg = "${name}"; - version = "${version}"; - sha256 = "1yf1m1587vd9l6w4x5b36g4kxrxqfpwbqk2l4mkqinzmwch9pc7s"; - }; - - beamDeps = []; - }; - bbcode_pleroma = buildMix rec { name = "bbcode_pleroma"; version = "0.2.0"; @@ -88,12 +75,12 @@ let bunt = buildMix rec { name = "bunt"; - version = "0.2.0"; + version = "0.2.1"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "0lw3v9kwbbcy1v6ygziiky887gffwwmxvyg4r1v0zm71kzhcgxbs"; + sha256 = "19bp6xh052ql3ha0v3r8999cvja5d2p6cph02mxphfaj4jsbyc53"; }; beamDeps = []; @@ -127,12 +114,12 @@ let castore = buildMix rec { name = "castore"; - version = "0.1.10"; + version = "0.1.18"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "0r96zwva2g6q59vyar8swaka0vxx27xfpf17xar2ss25rgh190x4"; + sha256 = "01kawrhxcc0i7zkygss5ia8hmkzv39q4bnrwnf0fz0mpa9jazfv1"; }; beamDeps = []; @@ -140,12 +127,12 @@ let certifi = buildRebar3 rec { name = "certifi"; - version = "2.8.0"; + version = "2.9.0"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "1slp20z2fgcq9p2bbdp1gj218kjqpx5jsa95sq40nq7qqv0yziva"; + sha256 = "0ha6vmf5p3xlbf5w1msa89frhvfk535rnyfybz9wdmh6vdms8v96"; }; beamDeps = []; @@ -177,6 +164,19 @@ let beamDeps = []; }; + concurrent_limiter = buildMix rec { + name = "concurrent_limiter"; + version = "0.1.1"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "1sqnb987qwwy4ip7kxh9g7vv5wz61fpv3pbnxpbv9yy073r8z5jk"; + }; + + beamDeps = [ telemetry ]; + }; + connection = buildMix rec { name = "connection"; version = "1.1.0"; @@ -203,6 +203,19 @@ let beamDeps = [ plug ]; }; + covertool = buildRebar3 rec { + name = "covertool"; + version = "2.0.4"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "1p0c1n3nl4063xwi1sv176l1x68xqf07qwvj444a5z888fx6i5aw"; + }; + + beamDeps = []; + }; + cowboy = buildErlangMk rec { name = "cowboy"; version = "2.9.0"; @@ -218,12 +231,12 @@ let cowboy_telemetry = buildRebar3 rec { name = "cowboy_telemetry"; - version = "0.3.1"; + version = "0.4.0"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "1bzhcdq12p837cii2jgvzjyrffiwgm5bsb1pra2an3hkcqrzsvis"; + sha256 = "1pn90is3k9dq64wbijvzkqb6ldfqvwiqi7ymc8dx6ra5xv0vm63x"; }; beamDeps = [ cowboy telemetry ]; @@ -244,12 +257,12 @@ let credo = buildMix rec { name = "credo"; - version = "1.5.5"; + version = "1.6.7"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "1pj7h9fk3i3rhxs65z8d64nwbnddhqj0dwy9bn2nm5cif2mj71nx"; + sha256 = "1lvxzksdrc2lbl0rzrww4q5rmayf37q0phcpz2kyvxq7n2zi1qa1"; }; beamDeps = [ bunt file_system jason ]; @@ -283,12 +296,12 @@ let db_connection = buildMix rec { name = "db_connection"; - version = "2.4.0"; + version = "2.4.2"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "1j6psw0dxq1175b6zcqpm6vavv4n6sv72ji57l8b6qczmlhnqhdd"; + sha256 = "0s1nx1gi96r8g7x8y7cklz8z823a6llh4fk996i5xxcr3flkrrag"; }; beamDeps = [ connection telemetry ]; @@ -322,12 +335,12 @@ let earmark = buildMix rec { name = "earmark"; - version = "1.4.15"; + version = "1.4.18"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "1vlrk5zmx1v5jnkkmchxwns8yy1kclzkcz0g6xpmiwy9bfw0j4iv"; + sha256 = "0q15ypgdr94z425dxb3blp6wqzrphsg1b6wscsfd13lmldnkpb2p"; }; beamDeps = [ earmark_parser ]; @@ -335,12 +348,12 @@ let earmark_parser = buildMix rec { name = "earmark_parser"; - version = "1.4.13"; + version = "1.4.17"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "1fhlh9bnph5nqdhy7w69xzb7lra1b3v16mk4yb947bx0ydmc40nn"; + sha256 = "08r06hp1wwfbfpalqqxwpq9lsd42pwvmhjr6bcb1r9pckyfchfpr"; }; beamDeps = []; @@ -348,12 +361,12 @@ let eblurhash = buildRebar3 rec { name = "eblurhash"; - version = "1.1.0"; + version = "1.2.2"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "07dmkbyafpxffh8ar6af4riqfxiqc547rias7i73gpgx16fqhsrf"; + sha256 = "0k040pj8hlm8mwy0ra459hk35v9gfsvvgp596nl27q2dj00cl84c"; }; beamDeps = []; @@ -361,12 +374,12 @@ let ecto = buildMix rec { name = "ecto"; - version = "3.6.2"; + version = "3.9.2"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "0kl893yi9jxzxnpd5gafivzazn96z2q24y04lfw8dyg60kxnvbgg"; + sha256 = "05cxg8rq6rawmn8ryfks5hj7h9b4k9bxxsn7k8l5b7p0fx8nsii1"; }; beamDeps = [ decimal jason telemetry ]; @@ -385,14 +398,27 @@ let beamDeps = [ ecto ecto_sql postgrex ]; }; + ecto_psql_extras = buildMix rec { + name = "ecto_psql_extras"; + version = "0.7.4"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "1ra9jh2p1jp1hn4g7aynivbrj52y9c20aspmqw6ksbkp3cpv079i"; + }; + + beamDeps = [ ecto_sql postgrex table_rex ]; + }; + ecto_sql = buildMix rec { name = "ecto_sql"; - version = "3.6.2"; + version = "3.9.0"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "0syv5wjdkywaxx9mmps0x9sdawqp3nnakbnf7av3ksj2yzkdgjay"; + sha256 = "0lv4b45j0bja98q0qhlp97a7zvb0g7x2bgkqr721m2rv0whggwx8"; }; beamDeps = [ db_connection ecto postgrex telemetry ]; @@ -424,40 +450,40 @@ let beamDeps = []; }; - esshd = buildMix rec { - name = "esshd"; - version = "0.1.1"; + esbuild = buildMix rec { + name = "esbuild"; + version = "0.5.0"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "10cryiv674p2mn9gvncl9j3rzgv0523chz9q6sm91lq960g38gnp"; + sha256 = "1rgzjjb0j3m0xz8gs112dydfz7m5brlpfm2qmz7w8qyr6ars10zi"; }; - beamDeps = []; + beamDeps = [ castore ]; }; - eternal = buildMix rec { - name = "eternal"; - version = "1.2.2"; + esshd = buildMix rec { + name = "esshd"; + version = "0.1.1"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "10p7m6kv2z2c16gw36wgiwnkykss4lfkmm71llxp09ipkhmy77rc"; + sha256 = "10cryiv674p2mn9gvncl9j3rzgv0523chz9q6sm91lq960g38gnp"; }; beamDeps = []; }; - ex2ms = buildMix rec { - name = "ex2ms"; - version = "1.5.0"; + eternal = buildMix rec { + name = "eternal"; + version = "1.2.2"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "13vh9yrs60cifqxzw52n6xxdp174w704vm1ks45k4avrzla763b7"; + sha256 = "10p7m6kv2z2c16gw36wgiwnkykss4lfkmm71llxp09ipkhmy77rc"; }; beamDeps = []; @@ -541,27 +567,14 @@ let beamDeps = [ poison syslog ]; }; - excoveralls = buildMix rec { - name = "excoveralls"; - version = "0.12.3"; - - src = fetchHex { - pkg = "${name}"; - version = "${version}"; - sha256 = "1nnsr9dv7mybcxx3y5p2gqzyy3p479w21c55vvsq6hi6dihkx2jn"; - }; - - beamDeps = [ hackney jason ]; - }; - fast_html = buildMix rec { name = "fast_html"; - version = "2.0.4"; + version = "2.0.5"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "1sk1fwib6x5isb3sy8g5i6gw0n6pfqrza12r89gas0pw3ma9vd1v"; + sha256 = "01k51qri44535b1hwixlxk7151vph6vapswlfq918g245544ypv0"; }; beamDeps = [ elixir_make nimble_pool ]; @@ -593,6 +606,19 @@ let beamDeps = []; }; + finch = buildMix rec { + name = "finch"; + version = "0.10.2"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "0l3mvf0jnh49rj58vj1051fvsj6294wjhlh8ycpfqb07har132yx"; + }; + + beamDeps = [ castore mint nimble_options nimble_pool telemetry ]; + }; + flake_id = buildMix rec { name = "flake_id"; version = "0.1.0"; @@ -632,45 +658,6 @@ let beamDeps = []; }; - gen_stage = buildMix rec { - name = "gen_stage"; - version = "0.14.3"; - - src = fetchHex { - pkg = "${name}"; - version = "${version}"; - sha256 = "0xld8m2l9a7pbzmq7vp0r9mz4pkisrjpslgbjs9ikhwlkllf4lw4"; - }; - - beamDeps = []; - }; - - gen_state_machine = buildMix rec { - name = "gen_state_machine"; - version = "2.0.5"; - - src = fetchHex { - pkg = "${name}"; - version = "${version}"; - sha256 = "1j21ih8cm0kkirjd2dh0gcxhngf5h3dvv4gqw6khj9ibww2x9b2w"; - }; - - beamDeps = []; - }; - - gettext = buildMix rec { - name = "gettext"; - version = "0.18.2"; - - src = fetchHex { - pkg = "${name}"; - version = "${version}"; - sha256 = "1igmn69xzj5wpkblg3k9v7wa2fjc2j0cncwx0grk1pag7nqkgxgr"; - }; - - beamDeps = []; - }; - gun = buildRebar3 rec { name = "gun"; version = "2.0.0-rc.2"; @@ -686,51 +673,51 @@ let hackney = buildRebar3 rec { name = "hackney"; - version = "1.18.0"; + version = "1.18.1"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "0pjwbf87nqj2ki3i076whrswh2cdhklj6cbaikdj1mq40xidmz4s"; + sha256 = "13hja14kig5jnzcizpdghj68i88f0yd9wjdfjic9nzi98kzxmv54"; }; beamDeps = [ certifi idna metrics mimerl parse_trans ssl_verify_fun unicode_util_compat ]; }; - html_entities = buildMix rec { - name = "html_entities"; - version = "0.5.2"; + hpax = buildMix rec { + name = "hpax"; + version = "0.1.2"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "1k7xyj0q38ms3n5hbn782pa6w1vgd6biwlxr4db6319l828a6fy5"; + sha256 = "04wci9ifsfyd2pbcrnpgh2aq0a8fi1lpkrzb91kz3x93b8yq91rc"; }; beamDeps = []; }; - html_sanitize_ex = buildMix rec { - name = "html_sanitize_ex"; - version = "1.3.0"; + html_entities = buildMix rec { + name = "html_entities"; + version = "0.5.2"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "1mhr2jnyzrqv0298m6vghnc9v2iwck11kwfhyh07gmc8v0x3kyxb"; + sha256 = "1k7xyj0q38ms3n5hbn782pa6w1vgd6biwlxr4db6319l828a6fy5"; }; - beamDeps = [ mochiweb ]; + beamDeps = []; }; http_signatures = buildMix rec { name = "http_signatures"; - version = "0.1.0"; + version = "0.1.1"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "097q5jffswcaav40i8dhlds6hgdhsz53yd3fz8w7vl9z3rrv79zq"; + sha256 = "18s2b5383xl2qjijkxag4mvwk2p5kv2fw58c9ii7pk12fc08lfyc"; }; beamDeps = []; @@ -777,12 +764,12 @@ let jason = buildMix rec { name = "jason"; - version = "1.2.2"; + version = "1.4.0"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "0y91s7q8zlfqd037c1mhqdhrvrf60l4ax7lzya1y33h5y3sji8hq"; + sha256 = "0891p2yrg3ri04p302cxfww3fi16pvvw1kh4r91zg85jhl87k8vr"; }; beamDeps = [ decimal ]; @@ -827,30 +814,30 @@ let beamDeps = []; }; - libring = buildMix rec { - name = "libring"; - version = "1.4.0"; + linkify = buildMix rec { + name = "linkify"; + version = "0.5.2"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "10bvf64jkviyyyff12hlhq4p2439gphyvmya8z85m0c6x1gg1shz"; + sha256 = "11mbbqm7yi6rhza5d2hd4fxkhdy3ik5n7sybj0n9bn0q09lsqwcd"; }; beamDeps = []; }; - linkify = buildMix rec { - name = "linkify"; - version = "0.5.1"; + majic = buildMix rec { + name = "majic"; + version = "1.0.0"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "0i7r9z49sdxs7nrnh2igmwzzmq9ih4fm02a046klmnps49z8q4m3"; + sha256 = "17hab8kmqc6gsiqicfgsaik0rvmakb6mbshlbxllj3b5fs7qa1br"; }; - beamDeps = []; + beamDeps = [ elixir_make mime nimble_pool plug ]; }; makeup = buildMix rec { @@ -944,6 +931,19 @@ let beamDeps = []; }; + mint = buildMix rec { + name = "mint"; + version = "1.4.2"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "106x9nmzi4ji5cqaddn76pxiyxdihk12z2qgszcdgd2rrjxsaxff"; + }; + + beamDeps = [ castore hpax ]; + }; + mochiweb = buildRebar3 rec { name = "mochiweb"; version = "2.18.0"; @@ -972,12 +972,12 @@ let mogrify = buildMix rec { name = "mogrify"; - version = "0.7.4"; + version = "0.9.1"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "1hwry2498qflc4g7fdwmxmzb2l0gr5c814ggzddwjsxsgwrrxmsh"; + sha256 = "01bzbfd0c932acnla5s3b5f9gvyyiwi0rgs815f15lipjccdykhk"; }; beamDeps = []; @@ -996,6 +996,19 @@ let beamDeps = []; }; + nimble_options = buildMix rec { + name = "nimble_options"; + version = "0.4.0"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "0bd0pi3sij9vxhiilv25x6n3jls75g3b38rljvm1x896ycd1qw76"; + }; + + beamDeps = []; + }; + nimble_parsec = buildMix rec { name = "nimble_parsec"; version = "0.5.0"; @@ -1011,12 +1024,12 @@ let nimble_pool = buildMix rec { name = "nimble_pool"; - version = "0.1.0"; + version = "0.2.6"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "1ygkr9ddzd3msif7hkqd75q27zlryhm9zww3191z7p0dcam1wfil"; + sha256 = "0gv59waa505mz2gi956sj1aa6844c65w2dp2qh2jfgsx15am0w8w"; }; beamDeps = []; @@ -1024,12 +1037,12 @@ let oban = buildMix rec { name = "oban"; - version = "2.3.4"; + version = "2.13.4"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "1prgpp7v03lgkia63j60jz3ds479ymm4991f882iizaq8x1s0367"; + sha256 = "097isyz3mlix1qkazsgbhgvx6sp02rvs2xdviy9dgqh9nj16zlm7"; }; beamDeps = [ ecto_sql jason postgrex telemetry ]; @@ -1048,19 +1061,6 @@ let beamDeps = [ jason plug poison ]; }; - p1_utils = buildRebar3 rec { - name = "p1_utils"; - version = "1.0.18"; - - src = fetchHex { - pkg = "${name}"; - version = "${version}"; - sha256 = "120znzz0yw1994nk6v28zql9plgapqpv51n9g6qm6md1f4x7gj0z"; - }; - - beamDeps = []; - }; - parse_trans = buildRebar3 rec { name = "parse_trans"; version = "3.3.1"; @@ -1089,25 +1089,25 @@ let phoenix = buildMix rec { name = "phoenix"; - version = "1.5.9"; + version = "1.6.15"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "0za2fpplmdq3axwng8736h6vz9wzlifhxy8apcgjy0bwlqhcwjvy"; + sha256 = "0wh6s8id3b4c4hgiawq995p192wxsws4sr4bm1g7b55kyvxvj2np"; }; - beamDeps = [ jason phoenix_html phoenix_pubsub plug plug_cowboy plug_crypto telemetry ]; + beamDeps = [ castore jason phoenix_pubsub phoenix_view plug plug_cowboy plug_crypto telemetry ]; }; phoenix_ecto = buildMix rec { name = "phoenix_ecto"; - version = "4.2.1"; + version = "4.4.0"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "1h23fy3pylaszh3l2zafq1a7fjwlwb3yw7dy09p0mb4wi6p1p2j7"; + sha256 = "1h9wnjmxns8y8dsr0r41ks66gscaqm7ivk4gsh5y07nkiralx1h9"; }; beamDeps = [ ecto phoenix_html plug ]; @@ -1115,25 +1115,64 @@ let phoenix_html = buildMix rec { name = "phoenix_html"; - version = "2.14.3"; + version = "3.2.0"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "03z8r285znlg25yi47d4l59s7jq58y4dnhvbxgp16npkzykrgmpg"; + sha256 = "0ky5idgid1psz6hmh2b2kmj6n974axww74hrxwv02p6jasx9gv1n"; }; beamDeps = [ plug ]; }; + phoenix_live_dashboard = buildMix rec { + name = "phoenix_live_dashboard"; + version = "0.6.2"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "0ywfqndxhjwx0pxv381p2rj5xzbaxvy248s41c1bba1ciarwdijv"; + }; + + beamDeps = [ ecto ecto_psql_extras mime phoenix_live_view telemetry_metrics ]; + }; + + phoenix_live_reload = buildMix rec { + name = "phoenix_live_reload"; + version = "1.3.3"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "1b5blinpmzdgspgk0dsy01bfjwwnhikb1gfiwnx8smazdrkrcrvn"; + }; + + beamDeps = [ file_system phoenix ]; + }; + + phoenix_live_view = buildMix rec { + name = "phoenix_live_view"; + version = "0.17.5"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "1qxhb1lw68vkz6h7q6ki0502pklfxgsx8sf72j11pxsd7mm6wn65"; + }; + + beamDeps = [ jason phoenix phoenix_html telemetry ]; + }; + phoenix_pubsub = buildMix rec { name = "phoenix_pubsub"; - version = "2.0.0"; + version = "2.1.1"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "0wgpa19l6xar0k2m117iz2kq3cw433llp07sqswpf5969y698bf5"; + sha256 = "1nfqrmbrq45if9pgk6g6vqiply2sxc40is3bfanphn7a3rnpqdl1"; }; beamDeps = []; @@ -1141,15 +1180,41 @@ let phoenix_swoosh = buildMix rec { name = "phoenix_swoosh"; - version = "0.3.3"; + version = "1.1.0"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "0gbwv2ffbxh8afsvdd221lhmpcijjjxls9zkzn060jwszl5g30ma"; + }; + + beamDeps = [ finch hackney phoenix phoenix_html phoenix_view swoosh ]; + }; + + phoenix_template = buildMix rec { + name = "phoenix_template"; + version = "1.0.0"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "0ms39n5s6kh532s20yxzj7sh0rz5lslh09ibq5j21lkglacny1hv"; + }; + + beamDeps = [ phoenix_html ]; + }; + + phoenix_view = buildMix rec { + name = "phoenix_view"; + version = "2.0.1"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "1k81cvhbzbc3czvin45j1rqagzp7drk3s0rp2xa5clz06bm0qm2a"; + sha256 = "1xm6p2r0rmspqax83s6rzqwx5gvbamy8cjwi533l3wy5xwn8wdbc"; }; - beamDeps = [ hackney phoenix phoenix_html swoosh ]; + beamDeps = [ phoenix_html phoenix_template ]; }; plug = buildMix rec { @@ -1167,25 +1232,25 @@ let plug_cowboy = buildMix rec { name = "plug_cowboy"; - version = "2.5.0"; + version = "2.6.0"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "06p7rmx01fknkf0frvjjaqs3qsz6066aa41qyd378n72lljqjb2v"; + sha256 = "19jgv5dm53hv5aqgxxzr3fnrpgfll9ics199swp6iriwfl5z4g07"; }; - beamDeps = [ cowboy cowboy_telemetry plug telemetry ]; + beamDeps = [ cowboy cowboy_telemetry plug ]; }; plug_crypto = buildMix rec { name = "plug_crypto"; - version = "1.2.2"; + version = "1.2.3"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "1nxnxj62iv4yvm4771jbxpj3l4brn2crz053y12s998lv5x1qqw7"; + sha256 = "18plj2idhp3f0nmqyjjf2rzj849l3br0797m8ln20p5dqscj0rxm"; }; beamDeps = []; @@ -1232,12 +1297,12 @@ let postgrex = buildMix rec { name = "postgrex"; - version = "0.15.9"; + version = "0.16.5"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "1vmd63vxwz8knid424b0rbp200vj7q7rz3xp98yj5cjc7q81j1v1"; + sha256 = "1s5jbwfzsdsyvlwgx3bqlfwilj2c468wi3qxq0c2d23fvhwxdspd"; }; beamDeps = [ connection db_connection decimal jason ]; @@ -1256,6 +1321,19 @@ let beamDeps = []; }; + prom_ex = buildMix rec { + name = "prom_ex"; + version = "1.7.1"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "027dlv89wl35wy0lbl7xf7308j42c42ls3ssj8rri4lap1r8i5sc"; + }; + + beamDeps = [ ecto finch jason oban phoenix phoenix_live_view plug plug_cowboy telemetry telemetry_metrics telemetry_metrics_prometheus_core telemetry_poller ]; + }; + prometheus = buildMix rec { name = "prometheus"; version = "4.8.0"; @@ -1308,19 +1386,6 @@ let beamDeps = [ accept plug prometheus_ex ]; }; - quack = buildMix rec { - name = "quack"; - version = "0.1.1"; - - src = fetchHex { - pkg = "${name}"; - version = "${version}"; - sha256 = "0hr5ppds4a9vih14hzs3lfj07r5069w8ifr7022fn4j18jkvydnp"; - }; - - beamDeps = [ poison tesla ]; - }; - ranch = buildRebar3 rec { name = "ranch"; version = "1.8.0"; @@ -1388,15 +1453,15 @@ let swoosh = buildMix rec { name = "swoosh"; - version = "1.3.11"; + version = "1.8.2"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "1bqkp41sh4h0q5yjmk0ywf5x979rwxshz16gp619jks5vd4a1qpi"; + sha256 = "1nxpcwq7ynvqjp65z544dvdfw7jx9k0m58w4kb0bdbdg1rsvln6h"; }; - beamDeps = [ cowboy gen_smtp hackney jason mime plug_cowboy ]; + beamDeps = [ cowboy ex_aws finch gen_smtp hackney jason mime plug_cowboy telemetry ]; }; syslog = buildRebar3 rec { @@ -1412,30 +1477,82 @@ let beamDeps = []; }; + table_rex = buildMix rec { + name = "table_rex"; + version = "3.1.1"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "141404hwnwnpspvhs112j2la8dfnvkwr0xy14ff42w6nljmj72k7"; + }; + + beamDeps = []; + }; + telemetry = buildRebar3 rec { name = "telemetry"; - version = "0.4.3"; + version = "1.0.0"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "0hc0fr2bh97wah9ycpm7hb5jdqr5hnl1s3b2ibbbx9gxbwvbhwpb"; + sha256 = "0yn5mr83hrx0dslsqxmfr5zf0a65hdak6926zd72i85lb7x0kg3k"; }; beamDeps = []; }; + telemetry_metrics = buildMix rec { + name = "telemetry_metrics"; + version = "0.6.1"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "1iilk2n75kn9i95fdp8mpxvn3rcn3ghln7p77cijqws13j3y1sbv"; + }; + + beamDeps = [ telemetry ]; + }; + + telemetry_metrics_prometheus_core = buildMix rec { + name = "telemetry_metrics_prometheus_core"; + version = "1.0.2"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "0c5pfm0jbri0x7p6cryif0b0h2iy0jqk4hmljz4kh3pqaq6ilda8"; + }; + + beamDeps = [ telemetry telemetry_metrics ]; + }; + + telemetry_poller = buildRebar3 rec { + name = "telemetry_poller"; + version = "1.0.0"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "0vjgxkxn9ll1gc6xd8jh4b0ldmg9l7fsfg7w63d44gvcssplx8mk"; + }; + + beamDeps = [ telemetry ]; + }; + tesla = buildMix rec { name = "tesla"; - version = "1.4.1"; + version = "1.4.4"; src = fetchHex { pkg = "${name}"; version = "${version}"; - sha256 = "06i0rshkm1byzgsphbr3al4hns7bcrpl1rxy8lwlp31cj8sxxxcm"; + sha256 = "0mv48vgby1fv9b2npc0ird3y4isr10np3a3yas3v5hfyz54kll6m"; }; - beamDeps = [ castore gun hackney jason mime poison telemetry ]; + beamDeps = [ castore finch gun hackney jason mime mint poison telemetry ]; }; timex = buildMix rec { @@ -1516,6 +1633,19 @@ let beamDeps = []; }; + web_push_encryption = buildMix rec { + name = "web_push_encryption"; + version = "0.3.1"; + + src = fetchHex { + pkg = "${name}"; + version = "${version}"; + sha256 = "18p2f1gqkg209vf3nychjxy7xpxhgiwyhn4halvr7yr2fvjv50jg"; + }; + + beamDeps = [ httpoison jose ]; + }; + websockex = buildMix rec { name = "websockex"; version = "0.4.3"; @@ -1530,3 +1660,4 @@ let }; }; in self + diff --git a/pkgs/servers/rtsp-simple-server/default.nix b/pkgs/servers/rtsp-simple-server/default.nix index 4f7805fc82201..fc6f97d49881f 100644 --- a/pkgs/servers/rtsp-simple-server/default.nix +++ b/pkgs/servers/rtsp-simple-server/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "rtsp-simple-server"; - version = "0.20.3"; + version = "0.21.0"; src = fetchFromGitHub { owner = "aler9"; repo = pname; rev = "v${version}"; - hash = "sha256-InuOHVhqh/MWBzE5xSQLP1/WWI/ayVFqOlA1ZjgNyVE="; + hash = "sha256-iLNdl6V+px/ri9uJzOrxktxJYqAJA5JWBd18ZHSLQjQ="; }; - vendorSha256 = "sha256-Egv9MCGSMd8RWjcXFKSU7LuoRgVwxiwzeSso9cuZ+ds="; + vendorSha256 = "sha256-48i0hsAho4dI79a/i24GlKAaC/yNGKt0uA+qCy5QTok="; # Tests need docker doCheck = false; diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile index 87fa849c69025..44bc53c3758a4 100644 --- a/pkgs/tools/security/metasploit/Gemfile +++ b/pkgs/tools/security/metasploit/Gemfile @@ -1,4 +1,4 @@ # frozen_string_literal: true source "https://rubygems.org" -gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.2.31" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.2.32" diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock index 66ec3d2793876..0b6562f274230 100644 --- a/pkgs/tools/security/metasploit/Gemfile.lock +++ b/pkgs/tools/security/metasploit/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/rapid7/metasploit-framework - revision: 2654f6f02a0ce6150e623804b9fab9576fe008f6 - ref: refs/tags/6.2.31 + revision: 70f696d7322148eba2fca49c5219dcb9a0133c6e + ref: refs/tags/6.2.32 specs: - metasploit-framework (6.2.31) + metasploit-framework (6.2.32) actionpack (~> 6.0) activerecord (~> 6.0) activesupport (~> 6.0) @@ -128,13 +128,13 @@ GEM arel-helpers (2.14.0) activerecord (>= 3.1.0, < 8) aws-eventstream (1.2.0) - aws-partitions (1.679.0) + aws-partitions (1.684.0) aws-sdk-core (3.168.4) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.651.0) aws-sigv4 (~> 1.5) jmespath (~> 1, >= 1.6.1) - aws-sdk-ec2 (1.355.0) + aws-sdk-ec2 (1.356.0) aws-sdk-core (~> 3, >= 3.165.0) aws-sigv4 (~> 1.1) aws-sdk-iam (1.73.0) @@ -171,9 +171,9 @@ GEM http_parser.rb (>= 0.6.0) em-socksify (0.3.2) eventmachine (>= 1.0.0.beta.4) - erubi (1.11.0) + erubi (1.12.0) eventmachine (1.2.7) - faker (3.0.0) + faker (3.1.0) i18n (>= 1.8.11, < 2) faraday (2.7.2) faraday-net_http (>= 2.0, < 3.1) @@ -203,7 +203,7 @@ GEM i18n (1.12.0) concurrent-ruby (~> 1.0) io-console (0.6.0) - irb (1.6.1) + irb (1.6.2) reline (>= 0.3.0) jmespath (1.6.2) jsobfu (0.4.2) @@ -248,7 +248,7 @@ GEM webrick metasploit_payloads-mettle (1.0.20) method_source (1.0.0) - mini_portile2 (2.8.0) + mini_portile2 (2.8.1) minitest (5.16.3) mqtt (0.5.0) msgpack (1.6.0) @@ -287,9 +287,9 @@ GEM ttfunk pg (1.4.5) public_suffix (5.0.1) - puma (6.0.0) + puma (6.0.1) nio4r (~> 2.0) - racc (1.6.1) + racc (1.6.2) rack (2.2.4) rack-protection (3.0.5) rack diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix index 52117de62d77e..59954f489397f 100644 --- a/pkgs/tools/security/metasploit/default.nix +++ b/pkgs/tools/security/metasploit/default.nix @@ -15,13 +15,13 @@ let }; in stdenv.mkDerivation rec { pname = "metasploit-framework"; - version = "6.2.31"; + version = "6.2.32"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = version; - sha256 = "sha256-oifgAc1umrEOULuJzK9EboBdXIXSici8ndlhRbbHUaw="; + sha256 = "sha256-uadIhrmrvdxzp4PchPHOy9beODME0hhgNqEqGqxyAZ8="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix index 470d83b7154a6..31123befc2d84 100644 --- a/pkgs/tools/security/metasploit/gemset.nix +++ b/pkgs/tools/security/metasploit/gemset.nix @@ -104,10 +104,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ijs16zjif7zkwi4wd1qffi7c5b1v5b6hnw76h8kh6vgiwj9hmmz"; + sha256 = "16jpljblpy5drx2fj8nwsw41mmwp7xkadhrigp4rsiny4lb80qg8"; type = "gem"; }; - version = "1.679.0"; + version = "1.684.0"; }; aws-sdk-core = { groups = ["default"]; @@ -124,10 +124,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1x0fg5gp7qcvfhngplb9438jv074llfb9d52jclnik8ibrrmgx8w"; + sha256 = "1l1zchxfsmbailrmjvw3s8djm20mqn0pjxf735mspp6zg3xmvyr2"; type = "gem"; }; - version = "1.355.0"; + version = "1.356.0"; }; aws-sdk-iam = { groups = ["default"]; @@ -314,10 +314,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "11bz1v1cxabm8672gabrw542zyg51dizlcvdck6vvwzagxbjv9zx"; + sha256 = "08s75vs9cxlc4r1q2bjg4br8g9wc5lc5x5vl0vv4zq5ivxsdpgi7"; type = "gem"; }; - version = "1.11.0"; + version = "1.12.0"; }; eventmachine = { groups = ["default"]; @@ -334,10 +334,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0fcrgzjvqc9fxhnn7mzvzxd41m63cil7n19mjxnisx836p0k93hl"; + sha256 = "1ppi7v8prf5856fslygvh64nwa4k2bsb9mablygb5gj0x5c7k29w"; type = "gem"; }; - version = "3.0.0"; + version = "3.1.0"; }; faraday = { groups = ["default"]; @@ -504,10 +504,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09mbpnmfh5lwg6kcjlbyv9163pn50lfxphbra9rsws8cp04m1qj3"; + sha256 = "10qvm0s8784lhmz98blqnxh36i7d7rzkk17znx17d46666z7czrf"; type = "gem"; }; - version = "1.6.1"; + version = "1.6.2"; }; jmespath = { groups = ["default"]; @@ -604,12 +604,12 @@ platforms = []; source = { fetchSubmodules = false; - rev = "2654f6f02a0ce6150e623804b9fab9576fe008f6"; - sha256 = "1b2iqyv4aqfrknyci2fjhmf5v03f8jpwr2dva07b36kfrl0y09x2"; + rev = "70f696d7322148eba2fca49c5219dcb9a0133c6e"; + sha256 = "17q1fan1lam16rh1ilh46cwdxmnbrvqq9p43lxrxrgdbp634i9xr"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "6.2.31"; + version = "6.2.32"; }; metasploit-model = { groups = ["default"]; @@ -666,10 +666,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rapl1sfmfi3bfr68da4ca16yhc0pp93vjwkj7y3rdqrzy3b41hy"; + sha256 = "1af4yarhbbx62f7qsmgg5fynrik0s36wjy3difkawy536xg343mp"; type = "gem"; }; - version = "2.8.0"; + version = "2.8.1"; }; minitest = { groups = ["default"]; @@ -927,20 +927,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yabmxmqprb2x58awiasidsiwpplscmyar9dzwh5l8jgaw4i3wra"; + sha256 = "0dy2yw2xp8bv52697y78vzrb4wj0zfa95bc9mxyh0d7l7rn65fmw"; type = "gem"; }; - version = "6.0.0"; + version = "6.0.1"; }; racc = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0p685i23lr8pl7l09g9l2mcj615fr7g33w3mkcr472lcg34nq8n8"; + sha256 = "09jgz6r0f7v84a7jz9an85q8vvmp743dqcsdm3z9c8rqcqv6pljq"; type = "gem"; }; - version = "1.6.1"; + version = "1.6.2"; }; rack = { groups = ["default"]; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 33a1320fc06ea..63e2305462675 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -951,7 +951,7 @@ mapAliases ({ moby = throw "moby has been removed, merged into linuxkit in 2018. Use linuxkit instead"; module_init_tools = throw "'module_init_tools' has been renamed to/replaced by 'kmod'"; # Converted to throw 2022-02-22 monero = monero-cli; # Added 2021-11-28 - monodevelop = throw "monodevelop has been removed from nixpgks"; # Added 2022-01-15 + monodevelop = throw "monodevelop has been removed from nixpkgs"; # Added 2022-01-15 mopidy-gmusic = throw "mopidy-gmusic has been removed because Google Play Music was discontinued"; # Added 2021-03-07 mopidy-local-images = throw "mopidy-local-images has been removed as it's unmaintained. Its functionality has been merged into the mopidy-local extension"; # Added 2020-10-18 mopidy-local-sqlite = throw "mopidy-local-sqlite has been removed as it's unmaintained. Its functionality has been merged into the mopidy-local extension"; # Added 2020-10-18 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f2ae6cfc422f4..f75fb132dfbec 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23717,8 +23717,8 @@ with pkgs; mod_tile = callPackage ../servers/http/apache-modules/mod_tile { }; mod_wsgi = self.mod_wsgi2; - mod_wsgi2 = callPackage ../servers/http/apache-modules/mod_wsgi { python = python2; ncurses = null; }; - mod_wsgi3 = callPackage ../servers/http/apache-modules/mod_wsgi { python = python3; }; + mod_wsgi2 = throw "mod_wsgi2 has been removed since Python 2 is EOL. Use mod_wsgi3 instead"; + mod_wsgi3 = callPackage ../servers/http/apache-modules/mod_wsgi { }; mod_itk = callPackage ../servers/http/apache-modules/mod_itk { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c66be90368c34..04b03d978f6ee 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6668,6 +6668,8 @@ self: super: with self; { packet-python = callPackage ../development/python-modules/packet-python { }; + packvers = callPackage ../development/python-modules/packvers { }; + pafy = callPackage ../development/python-modules/pafy { }; pagelabels = callPackage ../development/python-modules/pagelabels { }; |