diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index f8ebb3e9fac2..4e7941ac546d 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2872,6 +2872,13 @@ githubId = 718298; name = "Michael Livshin"; }; + CobaltCause = { + name = "Charles Hall"; + email = "charles@computer.surgery"; + github = "CobaltCause"; + githubId = 7003738; + matrix = "@charles:computer.surgery"; + }; cobbal = { email = "andrew.cobb@gmail.com"; github = "cobbal"; @@ -7175,6 +7182,12 @@ github = "joepie91"; githubId = 1663259; }; + joerdav = { + email = "joe.davidson.21111@gmail.com"; + github = "joerdav"; + name = "Joe Davidson"; + githubId = 19927761; + }; joesalisbury = { email = "salisbury.joseph@gmail.com"; github = "JosephSalisbury"; diff --git a/nixos/doc/manual/installation/installing.chapter.md b/nixos/doc/manual/installation/installing.chapter.md index cf783c2d22b6..7d67894e59f9 100644 --- a/nixos/doc/manual/installation/installing.chapter.md +++ b/nixos/doc/manual/installation/installing.chapter.md @@ -428,7 +428,7 @@ Use the following commands: UEFI systems - : You must select a boot-loader, either system-boot or GRUB. The recommended + : You must select a boot-loader, either systemd-boot or GRUB. The recommended option is systemd-boot: set the option [](#opt-boot.loader.systemd-boot.enable) to `true`. `nixos-generate-config` should do this automatically for new configurations when booted in UEFI mode. @@ -441,10 +441,10 @@ Use the following commands: If you want to use GRUB, set [](#opt-boot.loader.grub.device) to `nodev` and [](#opt-boot.loader.grub.efiSupport) to `true`. - With system-boot, you should not need any special configuration to detect + With systemd-boot, you should not need any special configuration to detect other installed systems. With GRUB, set [](#opt-boot.loader.grub.useOSProber) - to `true`, but this will only detect windows partitions, not other linux - distributions. If you dual boot another linux distribution, use system-boot + to `true`, but this will only detect windows partitions, not other Linux + distributions. If you dual boot another Linux distribution, use systemd-boot instead. If you need to configure networking for your machine the diff --git a/nixos/doc/manual/release-notes/rl-2305.section.md b/nixos/doc/manual/release-notes/rl-2305.section.md index 8c871a752ca6..276405199ca4 100644 --- a/nixos/doc/manual/release-notes/rl-2305.section.md +++ b/nixos/doc/manual/release-notes/rl-2305.section.md @@ -78,6 +78,8 @@ In addition to numerous new and upgraded packages, this release has the followin - `git-bug` has been updated to at least version 0.8.0, which includes backwards incompatible changes. The `git-bug-migration` package can be used to upgrade existing repositories. +- `keepassx` and `keepassx2` have been removed, due to upstream [stopping development](https://www.keepassx.org/index.html%3Fp=636.html). Consider [KeePassXC](https://keepassxc.org) as a maintained alternative. + - The `services.kubo.settings` option is now no longer stateful. If you changed any of the options in `services.kubo.settings` in the past and then removed them from your NixOS configuration again, those changes are still in your Kubo configuration file but will now be reset to the default. If you're unsure, you may want to make a backup of your configuration file (probably /var/lib/ipfs/config) and compare after the update. - The EC2 image module no longer fetches instance metadata in stage-1. This results in a significantly smaller initramfs, since network drivers no longer need to be included, and faster boots, since metadata fetching can happen in parallel with startup of other services. diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix index ab666ba39490..73322696aeac 100644 --- a/nixos/modules/services/x11/desktop-managers/plasma5.nix +++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix @@ -379,12 +379,7 @@ in security.pam.services.kde = { allowNullPassword = true; }; - # Doing these one by one seems silly, but we currently lack a better - # construct for handling common pam configs. - security.pam.services.gdm.enableKwallet = true; - security.pam.services.kdm.enableKwallet = true; - security.pam.services.lightdm.enableKwallet = true; - security.pam.services.sddm.enableKwallet = true; + security.pam.services.login.enableKwallet = true; systemd.user.services = { plasma-early-setup = mkIf cfg.runUsingSystemd { diff --git a/nixos/modules/services/x11/display-managers/sddm.nix b/nixos/modules/services/x11/display-managers/sddm.nix index a3f03d7a19a6..0ddeac0f1098 100644 --- a/nixos/modules/services/x11/display-managers/sddm.nix +++ b/nixos/modules/services/x11/display-managers/sddm.nix @@ -215,10 +215,12 @@ in }; security.pam.services = { - sddm = { - allowNullPassword = true; - startSession = true; - }; + sddm.text = '' + auth substack login + account include login + password substack login + session include login + ''; sddm-greeter.text = '' auth required pam_succeed_if.so audit quiet_success user = sddm diff --git a/pkgs/applications/editors/qemacs/default.nix b/pkgs/applications/editors/qemacs/default.nix index 9fc91fbe1977..6960ecb3d34e 100644 --- a/pkgs/applications/editors/qemacs/default.nix +++ b/pkgs/applications/editors/qemacs/default.nix @@ -1,15 +1,46 @@ -{ fetchurl, lib, stdenv, libX11, libXext, libXv, libpng }: +{ lib +, stdenv +, fetchFromGitHub +, buildPackages +, which +, texi2html +, enableX11 ? true +, libX11, libXext, libXv, libpng +}: stdenv.mkDerivation rec { pname = "qemacs"; - version = "0.3.3"; + version = "5.4.1c"; - src = fetchurl { - url = "https://bellard.org/${pname}/${pname}-${version}.tar.gz"; - sha256 = "156z4wpj49i6j388yjird5qvrph7hz0grb4r44l4jf3q8imadyrg"; + src = fetchFromGitHub { + owner = "qemacs"; + repo = "qemacs"; + rev = "216b3ff8b77ff138aec22045522d5601b7390e58"; + hash = "sha256-ngVaZZdr/Ym9YswLqzUtDytC0K7L9mKgORopLghGH3k="; }; - buildInputs = [ libpng libX11 libXext libXv ]; + postPatch = '' + substituteInPlace Makefile --replace \ + '$(INSTALL) -m 755 -s' \ + '$(INSTALL) -m 755 -s --strip-program=${stdenv.cc.targetPrefix}strip' + ''; + + nativeBuildInputs = [ which texi2html ]; + buildInputs = lib.optionals enableX11 [ libpng libX11 libXext libXv ]; + + enableParallelBuilding = true; + + configureFlags = [ + "--cross-prefix=${stdenv.cc.targetPrefix}" + ] ++ lib.optionals (!enableX11) [ + "--disable-x11" + ]; + + makeFlags = [ + # is actually used as BUILD_CC + "HOST_CC=${buildPackages.stdenv.cc}/bin/cc" + "CC=${stdenv.cc.targetPrefix}cc" + ]; preInstall = '' mkdir -p $out/bin $out/man diff --git a/pkgs/applications/kde/kalendar.nix b/pkgs/applications/kde/kalendar.nix index 86589606ef07..1bf6f3d1e139 100644 --- a/pkgs/applications/kde/kalendar.nix +++ b/pkgs/applications/kde/kalendar.nix @@ -13,6 +13,7 @@ , qqc2-desktop-style , kirigami2 +, kirigami-addons , kdbusaddons , ki18n , kcalendarcore @@ -59,6 +60,7 @@ mkDerivation rec { qqc2-desktop-style kirigami2 + kirigami-addons kdbusaddons ki18n kcalendarcore diff --git a/pkgs/applications/misc/keepassx/2.0.nix b/pkgs/applications/misc/keepassx/2.0.nix deleted file mode 100644 index 86bd7d0849ec..000000000000 --- a/pkgs/applications/misc/keepassx/2.0.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ lib, stdenv, fetchurl, cmake, libgcrypt, qt4, xorg }: - -stdenv.mkDerivation rec { - pname = "keepassx2"; - version = "2.0.3"; - - src = fetchurl { - url = "https://www.keepassx.org/releases/${version}/keepassx-${version}.tar.gz"; - sha256 = "1ia7cqx9ias38mnffsl7da7g1f66bcbjsi23k49sln0c6spb9zr3"; - }; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ libgcrypt qt4 xorg.libXtst ]; - - meta = { - description = "Qt password manager compatible with its Win32 and Pocket PC versions"; - homepage = "https://www.keepassx.org/"; - license = lib.licenses.gpl2; - maintainers = with lib.maintainers; [ qknight ]; - platforms = with lib.platforms; linux; - }; -} diff --git a/pkgs/applications/misc/keepassx/default.nix b/pkgs/applications/misc/keepassx/default.nix deleted file mode 100644 index 0fad28d94d3f..000000000000 --- a/pkgs/applications/misc/keepassx/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, stdenv, fetchurl, bzip2, qt4, qmake4Hook, libX11, xorgproto, libXtst }: - -stdenv.mkDerivation rec { - pname = "keepassx"; - version = "0.4.4"; - - src = fetchurl { - url = "https://www.keepassx.org/releases/${version}/${pname}-${version}.tar.gz"; - sha256 = "1i5dq10x28mg7m4c0yacm32xfj4j7imir4ph8x9p0s2ym260c9ry"; - }; - - patches = [ ./random.patch ]; - - buildInputs = [ bzip2 qt4 libX11 xorgproto libXtst ]; - - nativeBuildInputs = [ qmake4Hook ]; - - meta = { - description = "Qt password manager compatible with its Win32 and Pocket PC versions"; - homepage = "https://www.keepassx.org/"; - license = lib.licenses.gpl2; - maintainers = with lib.maintainers; [ qknight ]; - platforms = with lib.platforms; linux; - }; -} diff --git a/pkgs/applications/misc/keepassx/random.patch b/pkgs/applications/misc/keepassx/random.patch deleted file mode 100644 index 0a0b26f6e8c9..000000000000 --- a/pkgs/applications/misc/keepassx/random.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/src/lib/random.cpp 2014-01-21 21:15:55.829312723 +0000 -+++ b/src/lib/random.cpp 2014-01-21 21:16:36.752535839 +0000 -@@ -28,6 +28,10 @@ - #include - #include - #endif -+#ifndef Q_WS_WIN -+ #include -+ #include -+#endif - - #include - #include diff --git a/pkgs/applications/misc/keepassx/darwin.patch b/pkgs/applications/misc/keepassxc/darwin.patch similarity index 100% rename from pkgs/applications/misc/keepassx/darwin.patch rename to pkgs/applications/misc/keepassxc/darwin.patch diff --git a/pkgs/applications/misc/keepassx/community.nix b/pkgs/applications/misc/keepassxc/default.nix similarity index 100% rename from pkgs/applications/misc/keepassx/community.nix rename to pkgs/applications/misc/keepassxc/default.nix diff --git a/pkgs/applications/networking/p2p/transmission/default.nix b/pkgs/applications/networking/p2p/transmission/default.nix index 8d605877a62e..8f44d79f817d 100644 --- a/pkgs/applications/networking/p2p/transmission/default.nix +++ b/pkgs/applications/networking/p2p/transmission/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchFromGitHub +, fetchurl , cmake , pkg-config , openssl @@ -46,6 +47,14 @@ in stdenv.mkDerivation { fetchSubmodules = true; }; + patches = [ + # fix build with openssl 3.0 + (fetchurl { + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/net-p2p/transmission/files/transmission-3.00-openssl-3.patch"; + hash = "sha256-peVrkGck8AfbC9uYNfv1CIu1alIewpca7A6kRXjVlVs="; + }) + ]; + outputs = [ "out" "apparmor" ]; cmakeFlags = diff --git a/pkgs/applications/networking/remote/citrix-workspace/sources.nix b/pkgs/applications/networking/remote/citrix-workspace/sources.nix index 4acc2c57f19f..78f8b1a2a0c8 100644 --- a/pkgs/applications/networking/remote/citrix-workspace/sources.nix +++ b/pkgs/applications/networking/remote/citrix-workspace/sources.nix @@ -14,58 +14,14 @@ let # The latest versions can be found at https://www.citrix.com/downloads/workspace-app/linux/ supportedVersions = lib.mapAttrs mkVersionInfo { - "21.09.0" = { - major = "21"; - minor = "9"; + "23.02.0" = { + major = "23"; + minor = "2"; patch = "0"; - x64hash = "d58d5cbbcb5ace95b75b1400061d475b8e72dbdf5f03abacea6d39686991f848"; - x86hash = "c646c52889e88aa0bb051070076763d5407f21fb6ad6dfcb0fe635ac01180c51"; - x64suffix = "25"; - x86suffix = "25"; - homepage = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-2109.html"; - }; - - "21.12.0" = { - major = "21"; - minor = "12"; - patch = "0"; - x64hash = "de81deab648e1ebe0ddb12aa9591c8014d7fad4eba0db768f25eb156330bb34d"; - x86hash = "3746cdbe26727f7f6fb85fbe5f3e6df0322d79bb66e3a70158b22cb4f6b6b292"; - x64suffix = "18"; - x86suffix = "18"; - homepage = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-2112.html"; - }; - - "22.05.0" = { - major = "22"; - minor = "5"; - patch = "0"; - x64hash = "49786fd3b5361b1f42b7bb0e36572a209e95acb1335737da5216345b6420f053"; - x86hash = "f2dc1fd64e5314b62ba87f384958c2bbd48b06b55bed10345cddb05fdc8cffa1"; - x64suffix = "16"; - x86suffix = "16"; - homepage = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-latest2.html"; - }; - - "22.07.0" = { - major = "22"; - minor = "7"; - patch = "0"; - x64hash = "ba88490e457e0fe6c610778396e40293067173c182f2343c8c1fda5e2444985c"; - x86hash = "ed9ff8b3be968cacaf6121c783326091899b987e53fac1aafae68ea3e5883403"; - x64suffix = "14"; - x86suffix = "14"; - homepage = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-latest-OLD1.html"; - }; - - "22.12.0" = { - major = "22"; - minor = "12"; - patch = "0"; - x64hash = "3ec5a3d5526a6bac17bb977b173542f5bdd535a53baa6dca80c83a0d61229d74"; - x86hash = "b73f90fe51bbb7391c188a394ea614b67f128ed0d9481bd7824cbcadc0338dae"; - x64suffix = "12"; - x86suffix = "12"; + x64hash = "d0030a4782ba4b2628139635a12a7de044a4eb36906ef1eadb05b6ea77c1a7bc"; + x86hash = "39228fc8dd69adca4e56991c1ebc0832fec183c3ab5abd2d65c66b39b634391b"; + x64suffix = "10"; + x86suffix = "10"; homepage = "https://www.citrix.com/downloads/workspace-app/linux/workspace-app-for-linux-latest.html"; }; }; diff --git a/pkgs/applications/science/math/caffe/default.nix b/pkgs/applications/science/math/caffe/default.nix index d6c95633dd52..ed6836afbd92 100644 --- a/pkgs/applications/science/math/caffe/default.nix +++ b/pkgs/applications/science/math/caffe/default.nix @@ -21,7 +21,13 @@ }: let - inherit (cudaPackages) cudatoolkit cudnn nccl; + inherit (cudaPackages) cudatoolkit nccl; + # The default for cudatoolkit 10.1 is CUDNN 8.0.5, the last version to support CUDA 10.1. + # However, this caffe does not build with CUDNN 8.x, so we use CUDNN 7.6.5 instead. + # Earlier versions of cudatoolkit use pre-8.x CUDNN, so we use the default. + cudnn = if lib.versionOlder cudatoolkit.version "10.1" + then cudaPackages.cudnn + else cudaPackages.cudnn_7_6_5; in assert leveldbSupport -> (leveldb != null && snappy != null); diff --git a/pkgs/applications/science/misc/openmvg/default.nix b/pkgs/applications/science/misc/openmvg/default.nix index 9bd4cf12db03..f9bcfa5df73c 100644 --- a/pkgs/applications/science/misc/openmvg/default.nix +++ b/pkgs/applications/science/misc/openmvg/default.nix @@ -4,6 +4,7 @@ , libpng ? null , eigen ? null , libtiff ? null +, ceres-solver , enableShared ? !stdenv.hostPlatform.isStatic , enableExamples ? false , enableDocs ? false }: @@ -20,7 +21,7 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - buildInputs = [ libjpeg zlib libpng eigen libtiff cereal openmp ]; + buildInputs = [ libjpeg zlib libpng eigen libtiff cereal openmp ceres-solver ]; nativeBuildInputs = [ cmake pkg-config ]; @@ -28,6 +29,7 @@ stdenv.mkDerivation rec { "-DCMAKE_CXX_FLAGS=-std=c++11" "-DOpenMVG_BUILD_EXAMPLES=${if enableExamples then "ON" else "OFF"}" "-DOpenMVG_BUILD_DOC=${if enableDocs then "ON" else "OFF"}" + "-DTARGET_ARCHITECTURE=generic" ] ++ lib.optional enableShared "-DOpenMVG_BUILD_SHARED=ON"; cmakeDir = "./src"; diff --git a/pkgs/applications/version-management/jujutsu/default.nix b/pkgs/applications/version-management/jujutsu/default.nix index d198b528f2ad..36c67568020c 100644 --- a/pkgs/applications/version-management/jujutsu/default.nix +++ b/pkgs/applications/version-management/jujutsu/default.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage rec { pname = "jujutsu"; - version = "0.6.1"; + version = "0.7.0"; src = fetchFromGitHub { owner = "martinvonz"; repo = "jj"; rev = "v${version}"; - sha256 = "sha256-ajBL2o5i4UmclL/s9eEVtn/p51/F4gsClmcYBrAZ+1o="; + sha256 = "sha256-FczlSBlLhLIamLiY4cGVAoHx0/sxx+tykICzedFbbx8="; }; - cargoSha256 = "sha256-RgF2StIMfFzbp0azG4yRPvzrZ4kczWtOWVd+KTTPbRw="; + cargoHash = "sha256-PydDgXp47KUSLvAQgfO+09lrzTnBjzGd+zA5f/jZfRc="; # Needed to get openssl-sys to use pkg-config. OPENSSL_NO_VENDOR = 1; diff --git a/pkgs/development/libraries/arrow-cpp/default.nix b/pkgs/development/libraries/arrow-cpp/default.nix index 4bebd827145f..0796dce793d6 100644 --- a/pkgs/development/libraries/arrow-cpp/default.nix +++ b/pkgs/development/libraries/arrow-cpp/default.nix @@ -234,6 +234,12 @@ stdenv.mkDerivation rec { "TestMinioServer.Connect" "TestS3FS.*" "TestS3FSGeneric.*" + ] ++ lib.optionals stdenv.isDarwin [ + # TODO: revisit at 12.0.0 or when + # https://github.com/apache/arrow/commit/295c6644ca6b67c95a662410b2c7faea0920c989 + # is available, see + # https://github.com/apache/arrow/pull/15288#discussion_r1071244661 + "ExecPlanExecution.StressSourceSinkStopped" ]; in lib.optionalString doInstallCheck "-${lib.concatStringsSep ":" filteredTests}"; diff --git a/pkgs/development/python-modules/accessible-pygments/default.nix b/pkgs/development/python-modules/accessible-pygments/default.nix new file mode 100644 index 000000000000..0b5c39117cc7 --- /dev/null +++ b/pkgs/development/python-modules/accessible-pygments/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, pygments +}: + +buildPythonPackage rec { + pname = "accessible-pygments"; + version = "0.0.3"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-CRe1B2RqazOT60kJGmJQb2sqOTX12V5NEkncUF+KTq4="; + }; + + propagatedBuildInputs = [ + pygments + ]; + + # Tests only execute pygments with these styles + doCheck = false; + + pythonImportsCheck = [ + "a11y_pygments" + "a11y_pygments.utils" + ]; + + meta = with lib; { + description = "A collection of accessible pygments styles"; + homepage = "https://github.com/Quansight-Labs/accessible-pygments"; + changelog = "https://github.com/Quansight-Labs/accessible-pygments/raw/v${version}/CHANGELOG.md"; + license = licenses.bsd3; + maintainers = with maintainers; [ marsam ]; + }; +} diff --git a/pkgs/development/python-modules/adjusttext/default.nix b/pkgs/development/python-modules/adjusttext/default.nix index fd4fb79a5999..3aa50cc101f0 100644 --- a/pkgs/development/python-modules/adjusttext/default.nix +++ b/pkgs/development/python-modules/adjusttext/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "adjusttext"; - version = "0.7.3.1"; + version = "0.8.0"; format = "setuptools"; src = fetchFromGitHub { owner = "Phlya"; repo = pname; - rev = version; - sha256 = "1a6hizx1cnplj0irn8idgda2lacsb61dw464cwx798pjr1gd401n"; + rev = "refs/tags/${version}"; + sha256 = "sha256-N+eCDwK5E9zGKG7uruuhnpTlJeiXG2a15PKW0gJFAqw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/grad-cam/default.nix b/pkgs/development/python-modules/grad-cam/default.nix index 4e43915c86df..bdfa8c0e49c0 100644 --- a/pkgs/development/python-modules/grad-cam/default.nix +++ b/pkgs/development/python-modules/grad-cam/default.nix @@ -6,7 +6,7 @@ , numpy , opencv4 , pillow -, scikitlearn +, scikit-learn , torch , torchvision , ttach @@ -33,7 +33,7 @@ buildPythonPackage rec { numpy opencv4 pillow - scikitlearn + scikit-learn torchvision ttach tqdm diff --git a/pkgs/development/python-modules/oslo-context/default.nix b/pkgs/development/python-modules/oslo-context/default.nix index fe4e7363cfc1..0db271b6cd5d 100644 --- a/pkgs/development/python-modules/oslo-context/default.nix +++ b/pkgs/development/python-modules/oslo-context/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "oslo.context"; - version = "5.0.0"; + version = "5.1.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-iMDG0HZoHGDVYPfWZWXkKsEWxaqKKKBNt8CsACUTMiQ="; + sha256 = "sha256-iy2aT4xGrulNTot8oa4JeJv4QqRwaKr6sIjibDMUqyI="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pydata-sphinx-theme/default.nix b/pkgs/development/python-modules/pydata-sphinx-theme/default.nix index b828120a309c..a2a2a348a73d 100644 --- a/pkgs/development/python-modules/pydata-sphinx-theme/default.nix +++ b/pkgs/development/python-modules/pydata-sphinx-theme/default.nix @@ -3,6 +3,7 @@ , pythonOlder , fetchPypi , sphinx +, accessible-pygments , beautifulsoup4 , docutils , packaging @@ -10,7 +11,7 @@ buildPythonPackage rec { pname = "pydata-sphinx-theme"; - version = "0.12.0"; + version = "0.13.0rc4"; format = "wheel"; @@ -21,17 +22,20 @@ buildPythonPackage rec { dist = "py3"; python = "py3"; pname = "pydata_sphinx_theme"; - sha256 = "sha256-wX26tno3dPBvNPY3jolvzQZozItdocG6AX5lzx3wr1g="; + sha256 = "sha256-tLkCMX/LvFxYPOskW2LXHkfHggsG/CIo41W3BF1Zvpc="; }; propagatedBuildInputs = [ sphinx + accessible-pygments beautifulsoup4 docutils packaging ]; - pythonImportsCheck = [ "pydata_sphinx_theme" ]; + pythonImportsCheck = [ + "pydata_sphinx_theme" + ]; meta = with lib; { description = "Bootstrap-based Sphinx theme from the PyData community"; diff --git a/pkgs/development/python-modules/sphinx-book-theme/default.nix b/pkgs/development/python-modules/sphinx-book-theme/default.nix index 6c5597755a36..12a5878024b8 100644 --- a/pkgs/development/python-modules/sphinx-book-theme/default.nix +++ b/pkgs/development/python-modules/sphinx-book-theme/default.nix @@ -5,11 +5,12 @@ , sphinx , pydata-sphinx-theme , pyyaml +, jupyter-book }: buildPythonPackage rec { pname = "sphinx-book-theme"; - version = "0.4.0rc1"; + version = "1.0.0rc2"; format = "wheel"; @@ -20,7 +21,7 @@ buildPythonPackage rec { dist = "py3"; python = "py3"; pname = "sphinx_book_theme"; - sha256 = "bfad8ef469885da5633f7cf7f8cd9a0ae11ea2351a91e507b44cf15973934512"; + sha256 = "43977402f55b79706e117c6de6f50e67dac6dad698eb9b75be07dc2e6a689bde"; }; propagatedBuildInputs = [ @@ -29,7 +30,13 @@ buildPythonPackage rec { pyyaml ]; - pythonImportsCheck = [ "sphinx_book_theme" ]; + pythonImportsCheck = [ + "sphinx_book_theme" + ]; + + passthru.tests = { + inherit jupyter-book; + }; meta = with lib; { description = "A clean book theme for scientific explanations and documentation with Sphinx"; diff --git a/pkgs/development/python-modules/tempest/default.nix b/pkgs/development/python-modules/tempest/default.nix index 7198620b8ff0..ca79b7b771c2 100644 --- a/pkgs/development/python-modules/tempest/default.nix +++ b/pkgs/development/python-modules/tempest/default.nix @@ -1,5 +1,6 @@ { lib , buildPythonPackage +, defusedxml , fetchPypi , pbr , cliff @@ -14,6 +15,7 @@ , oslo-serialization , oslo-utils , fixtures +, pythonOlder , pyyaml , subunit , stevedore @@ -29,6 +31,9 @@ buildPythonPackage rec { pname = "tempest"; version = "33.0.0"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; @@ -38,6 +43,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pbr cliff + defusedxml jsonschema testtools paramiko diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index 9f2e8dbfcd11..06516ab2fba9 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -203,7 +203,12 @@ in }; eventmachine = attrs: { + dontBuild = false; buildInputs = [ openssl ]; + postPatch = '' + substituteInPlace ext/em.cpp \ + --replace 'if (bind (' 'if (::bind (' + ''; }; exif = attrs: { diff --git a/pkgs/development/tools/clj-kondo/default.nix b/pkgs/development/tools/clj-kondo/default.nix index 741983b7e6f4..6b0ddc25d110 100644 --- a/pkgs/development/tools/clj-kondo/default.nix +++ b/pkgs/development/tools/clj-kondo/default.nix @@ -2,11 +2,11 @@ buildGraalvmNativeImage rec { pname = "clj-kondo"; - version = "2023.01.20"; + version = "2023.02.17"; src = fetchurl { url = "https://github.com/clj-kondo/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar"; - sha256 = "sha256-QS4/kGR3QqwUk0U68AdKvip9YJndltx7YBo9IhZ9syY="; + sha256 = "sha256-HVwZZ280ZABgG/LAAaRfq6wYmUF1c2ojR7XLMCwVSk0="; }; extraNativeImageBuildArgs = [ diff --git a/pkgs/development/tools/misc/phpunit/default.nix b/pkgs/development/tools/misc/phpunit/default.nix new file mode 100644 index 000000000000..0b95f2f17021 --- /dev/null +++ b/pkgs/development/tools/misc/phpunit/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchurl, makeWrapper, lib, php }: + +let + pname = "phpunit"; + version = "10.0.11"; +in +stdenv.mkDerivation { + inherit pname version; + + src = fetchurl { + url = "https://phar.phpunit.de/phpunit-${version}.phar"; + hash = "sha256-zAAFDiZ2wjncGMI4c74+tzWR++rKMjv1h5gk2GobhbI="; + }; + + dontUnpack = true; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + runHook preInstall + mkdir -p $out/bin + install -D $src $out/libexec/phpunit/phpunit.phar + makeWrapper ${php}/bin/php $out/bin/phpunit \ + --add-flags "$out/libexec/phpunit/phpunit.phar" + runHook postInstall + ''; + + meta = with lib; { + description = "PHP Unit Testing framework"; + license = licenses.bsd3; + homepage = "https://phpunit.de"; + changelog = "https://github.com/sebastianbergmann/phpunit/blob/${version}/ChangeLog-${lib.versions.majorMinor version}.md"; + maintainers = with maintainers; [ onny ] ++ teams.php.members; + }; +} diff --git a/pkgs/development/tools/xc/default.nix b/pkgs/development/tools/xc/default.nix new file mode 100644 index 000000000000..7a2e6dd83c49 --- /dev/null +++ b/pkgs/development/tools/xc/default.nix @@ -0,0 +1,22 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "xc"; + version = "0.0.154"; + + src = fetchFromGitHub { + owner = "joerdav"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-GJBSPO0PffGdGAHofd1crEFXJi2xqgd8Vk2/g4ff+E4="; + }; + + vendorHash = "sha256-XDJdCh6P8ScSvxY55ExKgkgFQqmBaM9fMAjAioEQ0+s="; + + meta = with lib; { + homepage = "https://xcfile.dev/"; + description = "Markdown defined task runner"; + license = licenses.mit; + maintainers = with maintainers; [ joerdav ]; + }; +} diff --git a/pkgs/games/dwarf-fortress/unfuck.nix b/pkgs/games/dwarf-fortress/unfuck.nix index 27b54667f0b9..9b7de93ecd7d 100644 --- a/pkgs/games/dwarf-fortress/unfuck.nix +++ b/pkgs/games/dwarf-fortress/unfuck.nix @@ -82,6 +82,11 @@ stdenv.mkDerivation { sha256 = release.sha256; }; + postPatch = '' + # https://github.com/svenstaro/dwarf_fortress_unfuck/pull/27 + substituteInPlace CMakeLists.txt --replace \''${GLEW_LIBRARIES} GLEW::glew + ''; + cmakeFlags = [ "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include" "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include" diff --git a/pkgs/os-specific/linux/kernel/gen-kheaders-metadata.patch b/pkgs/os-specific/linux/kernel/gen-kheaders-metadata.patch deleted file mode 100644 index 0639f8b4e8fb..000000000000 --- a/pkgs/os-specific/linux/kernel/gen-kheaders-metadata.patch +++ /dev/null @@ -1,86 +0,0 @@ -From 2cc99c9cdc8fde5e92e34f9655829449cebd3e00 Mon Sep 17 00:00:00 2001 -From: Dmitry Goldin -Date: Fri, 4 Oct 2019 10:40:07 +0000 -Subject: kheaders: make headers archive reproducible - -In commit 43d8ce9d65a5 ("Provide in-kernel headers to make -extending kernel easier") a new mechanism was introduced, for kernels ->=5.2, which embeds the kernel headers in the kernel image or a module -and exposes them in procfs for use by userland tools. - -The archive containing the header files has nondeterminism caused by -header files metadata. This patch normalizes the metadata and utilizes -KBUILD_BUILD_TIMESTAMP if provided and otherwise falls back to the -default behaviour. - -In commit f7b101d33046 ("kheaders: Move from proc to sysfs") it was -modified to use sysfs and the script for generation of the archive was -renamed to what is being patched. - -Signed-off-by: Dmitry Goldin -Reviewed-by: Greg Kroah-Hartman -Reviewed-by: Joel Fernandes (Google) -Signed-off-by: Masahiro Yamada - ---- - -nixos note: This patch is from -https://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git/commit/?h=fixes&id=2cc99c9cdc8fde5e92e34f9655829449cebd3e00 -I commented out the documentation part here, so that it easily applies -to linux 5.2 and 5.3, which does not ship with the reproducible build -documentation yet, which only was introduced recently. - ---- - Documentation/kbuild/reproducible-builds.rst | 13 +++++++++---- - kernel/gen_kheaders.sh | 5 ++++- - 2 files changed, 13 insertions(+), 5 deletions(-) - -#diff --git a/Documentation/kbuild/reproducible-builds.rst b/Documentation/kbuild/reproducible-builds.rst -#index ab92e98c89c8..503393854e2e 100644 -# --- a/Documentation/kbuild/reproducible-builds.rst -#+++ b/Documentation/kbuild/reproducible-builds.rst -#@@ -16,16 +16,21 @@ the kernel may be unreproducible, and how to avoid them. -# Timestamps -# ---------- -# -#-The kernel embeds a timestamp in two places: -#+The kernel embeds timestamps in three places: -# -# * The version string exposed by ``uname()`` and included in -# ``/proc/version`` -# -# * File timestamps in the embedded initramfs -# -#-By default the timestamp is the current time. This must be overridden -#-using the `KBUILD_BUILD_TIMESTAMP`_ variable. If you are building -#-from a git commit, you could use its commit date. -#+* If enabled via ``CONFIG_IKHEADERS``, file timestamps of kernel -#+ headers embedded in the kernel or respective module, -#+ exposed via ``/sys/kernel/kheaders.tar.xz`` -#+ -#+By default the timestamp is the current time and in the case of -#+``kheaders`` the various files' modification times. This must -#+be overridden using the `KBUILD_BUILD_TIMESTAMP`_ variable. -#+If you are building from a git commit, you could use its commit date. -# -# The kernel does *not* use the ``__DATE__`` and ``__TIME__`` macros, -# and enables warnings if they are used. If you incorporate external -diff --git a/kernel/gen_kheaders.sh b/kernel/gen_kheaders.sh -index 9ff449888d9c..aff79e461fc9 100755 ---- a/kernel/gen_kheaders.sh -+++ b/kernel/gen_kheaders.sh -@@ -71,7 +71,10 @@ done | cpio --quiet -pd $cpio_dir >/dev/null 2>&1 - find $cpio_dir -type f -print0 | - xargs -0 -P8 -n1 perl -pi -e 'BEGIN {undef $/;}; s/\/\*((?!SPDX).)*?\*\///smg;' - --tar -Jcf $tarfile -C $cpio_dir/ . > /dev/null -+# Create archive and try to normalize metadata for reproducibility -+tar "${KBUILD_BUILD_TIMESTAMP:+--mtime=$KBUILD_BUILD_TIMESTAMP}" \ -+ --owner=0 --group=0 --sort=name --numeric-owner \ -+ -Jcf $tarfile -C $cpio_dir/ . > /dev/null - - echo "$src_files_md5" > kernel/kheaders.md5 - echo "$obj_files_md5" >> kernel/kheaders.md5 --- -cgit 1.2-0.3.lf.el7 - diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 18c32930f368..21e6790eb0b6 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -86,9 +86,6 @@ let buildDTBs = kernelConf.DTB or false; - installsFirmware = (config.isEnabled "FW_LOADER") && - (isModular || (config.isDisabled "FIRMWARE_IN_KERNEL")) && - (lib.versionOlder version "4.14"); in (optionalAttrs isModular { outputs = [ "out" "dev" ]; }) // { passthru = rec { inherit version modDirVersion config kernelPatches configfile @@ -107,8 +104,6 @@ let # Required for deterministic builds along with some postPatch magic. ++ optional (lib.versionOlder version "5.19") ./randstruct-provide-seed.patch ++ optional (lib.versionAtLeast version "5.19") ./randstruct-provide-seed-5.19.patch - # Fixes determinism by normalizing metadata for the archive of kheaders - ++ optional (lib.versionAtLeast version "5.2" && lib.versionOlder version "5.4") ./gen-kheaders-metadata.patch # Linux 5.12 marked certain PowerPC-only symbols as GPL, which breaks # OpenZFS; this was fixed in Linux 5.19 so we backport the fix # https://github.com/openzfs/zfs/pull/13367 @@ -201,7 +196,6 @@ let installFlags = [ "INSTALL_PATH=$(out)" ] ++ (optional isModular "INSTALL_MOD_PATH=$(out)") - ++ optional installsFirmware "INSTALL_FW_PATH=$(out)/lib/firmware" ++ optionals buildDTBs ["dtbs_install" "INSTALL_DTBS_PATH=$(out)/dtbs"]; preInstall = let @@ -268,9 +262,7 @@ let else "install")) ]; - postInstall = (optionalString installsFirmware '' - mkdir -p $out/lib/firmware - '') + (if isModular then '' + postInstall = optionalString isModular '' mkdir -p $dev cp vmlinux $dev/ if [ -z "''${dontStrip-}" ]; then @@ -343,10 +335,7 @@ let # Remove reference to kmod sed -i Makefile -e 's|= ${buildPackages.kmod}/bin/depmod|= depmod|' - '' else optionalString installsFirmware '' - make firmware_install $makeFlags "''${makeFlagsArray[@]}" \ - $installFlags "''${installFlagsArray[@]}" - ''); + ''; requiredSystemFeatures = [ "big-parallel" ]; diff --git a/pkgs/servers/dns/doh-proxy-rust/default.nix b/pkgs/servers/dns/doh-proxy-rust/default.nix index d4e61ee045e8..2e17dd81f6fe 100644 --- a/pkgs/servers/dns/doh-proxy-rust/default.nix +++ b/pkgs/servers/dns/doh-proxy-rust/default.nix @@ -2,15 +2,15 @@ rustPlatform.buildRustPackage rec { pname = "doh-proxy-rust"; - version = "0.9.7"; + version = "0.9.8"; src = fetchCrate { inherit version; crateName = "doh-proxy"; - sha256 = "sha256-rcLI5sLdqelnpfU7/T0s0l3rtpYBd77BBAXc4xSmCCE="; + sha256 = "sha256-+Z2eneEK6nhcJEKRa1VIolCTZ8to2mMQ8Ik7WEH+1w0="; }; - cargoHash = "sha256-zkZuyegz82xOBq2t0jkMo6SLLteOHuhrFcROZCQeiyk="; + cargoHash = "sha256-nlKzVQeLg3/nBIkD7QoBUWC93m9BiJrybf13Y/ns9gA="; buildInputs = lib.optionals stdenv.isDarwin [ Security libiconv ]; diff --git a/pkgs/servers/rtsp-simple-server/default.nix b/pkgs/servers/rtsp-simple-server/default.nix index 0ff710ae6349..668f6f8fdf84 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.21.2"; + version = "0.21.4"; src = fetchFromGitHub { owner = "aler9"; repo = pname; rev = "v${version}"; - hash = "sha256-dg+Xl3yHiWJPV+3iFcMVCPHOpHo0+pFiJv+ZVXDAK6k="; + hash = "sha256-56BHSRwiYxQHo32d0ZVKJB44GCEG6GRwrjQq6GlIHBc="; }; - vendorHash = "sha256-KvG0+wxe0D+TxQmxaskTa228zUlOxCZE9rGqMYkdwzM="; + vendorHash = "sha256-HYuW129TQjcG+JGO6OtweIwjcs6hmgaikDaaM4VFSd0="; # Tests need docker doCheck = false; diff --git a/pkgs/tools/misc/engage/default.nix b/pkgs/tools/misc/engage/default.nix new file mode 100644 index 000000000000..c01dcc2e6879 --- /dev/null +++ b/pkgs/tools/misc/engage/default.nix @@ -0,0 +1,29 @@ +{ lib +, rustPlatform +, fetchgit +}: + +let + pname = "engage"; + version = "0.1.2"; +in +rustPlatform.buildRustPackage { + inherit pname version; + + # fetchFromGitLab doesn't work on GitLab's end for unknown reasons + src = fetchgit { + url = "https://or.computer.surgery/charles/${pname}"; + rev = "v${version}"; + hash = "sha256-7zLFgTLeAIaMMoj0iThH/5UhnV9OUGe9CVwbbShCieo="; + }; + + cargoHash = "sha256-+4uqC0VoBSmkS9hYC1lzWeJmK873slZT04TljHPE+Eo="; + + meta = { + description = "A task runner with DAG-based parallelism"; + homepage = "https://or.computer.surgery/charles/engage"; + changelog = "https://or.computer.surgery/charles/engage/-/blob/v${version}/CHANGELOG.md"; + license = with lib.licenses; [ asl20 mit ]; + maintainers = with lib.maintainers; [ CobaltCause ]; + }; +} diff --git a/pkgs/tools/misc/tbls/default.nix b/pkgs/tools/misc/tbls/default.nix index bca16be194f1..f0f87fbfab9f 100644 --- a/pkgs/tools/misc/tbls/default.nix +++ b/pkgs/tools/misc/tbls/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "tbls"; - version = "1.62.0"; + version = "1.62.1"; src = fetchFromGitHub { owner = "k1LoW"; repo = "tbls"; rev = "v${version}"; - hash = "sha256-T2zmgGbhWvqaor76mQuQ1O5bF+eGVaH6N4w17iyNhwU="; + hash = "sha256-x3Bh/xB/x71xNjVL5zqp1ag8TPQoxOpuOyDE1f54sGQ="; }; - vendorHash = "sha256-AeaTAjo1wRl7Ymg/fyoijaa9UXf9SiNR447WJtZeN5o="; + vendorHash = "sha256-YrDQSySBplYgakgvb6BwK1AK6h0Usy8MvCndHSSYrlQ="; CGO_CFLAGS = [ "-Wno-format-security" ]; diff --git a/pkgs/tools/networking/sing-box/default.nix b/pkgs/tools/networking/sing-box/default.nix index aea1964e8777..6d039cf541fb 100644 --- a/pkgs/tools/networking/sing-box/default.nix +++ b/pkgs/tools/networking/sing-box/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "sing-box"; - version = "1.1.5"; + version = "1.1.6"; src = fetchFromGitHub { owner = "SagerNet"; repo = pname; rev = "v${version}"; - hash = "sha256-FEwyJL6pFdp9vXIq1TUFGGDfKefFsVaajjX2U0R5Vog="; + hash = "sha256-CwXhCJo6Nq0dZaTcUetsSpvNKme1PN6pzMRX1QeY3gg="; }; - vendorHash = "sha256-QTk4kKPPOhnCf/1NhWObwf8EsZC+k0EtdSBecD6jq04="; + vendorHash = "sha256-cLaMtnTSmCZoPwfeQpWXCiFtmDm3vA6AD12H5h8Obhk="; tags = [ "with_quic" diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index fc10da8e441f..0d1ac8182792 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -729,8 +729,10 @@ mapAliases ({ kdecoration-viewer = throw "kdecoration-viewer has been removed from nixpkgs, as there is no upstream activity"; # Added 2020-06-16 kdiff3-qt5 = throw "'kdiff3-qt5' has been renamed to/replaced by 'kdiff3'"; # Converted to throw 2022-02-22 keepass-keefox = throw "'keepass-keefox' has been renamed to/replaced by 'keepass-keepassrpc'"; # Converted to throw 2022-02-22 + keepassx = throw "KeePassX is no longer actively developed. Please consider KeePassXC as a maintained alternative."; # Added 2023-02-17 keepassx-community = throw "'keepassx-community' has been renamed to/replaced by 'keepassxc'"; # Converted to throw 2022-02-22 keepassx-reboot = throw "'keepassx-reboot' has been renamed to/replaced by 'keepassx-community'"; # Converted to throw 2022-02-22 + keepassx2 = throw "KeePassX is no longer actively developed. Please consider KeePassXC as a maintained alternative."; # Added 2023-02-17 keepassx2-http = throw "'keepassx2-http' has been renamed to/replaced by 'keepassx-reboot'"; # Converted to throw 2022-02-22 keepnote = throw "keepnote has been removed from nixpkgs, as it is stuck on python2"; # Added 2022-01-01 kerberos = libkrb5; # moved from top-level 2021-03-14 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 63f36668f7bc..b37c8cdf14a6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3501,6 +3501,8 @@ with pkgs; waypoint = callPackage ../applications/networking/cluster/waypoint { }; + xc = callPackage ../development/tools/xc { }; + xcodeenv = callPackage ../development/mobile/xcodeenv { }; gomobile = callPackage ../development/mobile/gomobile { }; @@ -4554,6 +4556,8 @@ with pkgs; enca = callPackage ../tools/text/enca { }; + engage = callPackage ../tools/misc/engage { }; + ent = callPackage ../tools/misc/ent { }; entwine = callPackage ../applications/graphics/entwine { }; @@ -5989,13 +5993,9 @@ with pkgs; cirrusgo = callPackage ../tools/security/cirrusgo { }; inherit (callPackage ../applications/networking/remote/citrix-workspace { }) - citrix_workspace_21_09_0 - citrix_workspace_21_12_0 - citrix_workspace_22_05_0 - citrix_workspace_22_07_0 - citrix_workspace_22_12_0 + citrix_workspace_23_02_0 ; - citrix_workspace = citrix_workspace_22_12_0; + citrix_workspace = citrix_workspace_23_02_0; cmigemo = callPackage ../tools/text/cmigemo { }; @@ -17058,6 +17058,8 @@ with pkgs; ansible-doctor = with python3.pkgs; toPythonApplication ansible-doctor; + phpunit = callPackage ../development/tools/misc/phpunit { }; + ### DEVELOPMENT / TOOLS / LANGUAGE-SERVERS ansible-language-server = callPackage ../development/tools/language-servers/ansible-language-server { }; @@ -29301,9 +29303,7 @@ with pkgs; karlender = callPackage ../applications/office/karlender { }; - keepassx = callPackage ../applications/misc/keepassx { }; - keepassx2 = callPackage ../applications/misc/keepassx/2.0.nix { }; - keepassxc = libsForQt5.callPackage ../applications/misc/keepassx/community.nix { + keepassxc = libsForQt5.callPackage ../applications/misc/keepassxc { inherit (darwin.apple_sdk_11_0.frameworks) LocalAuthentication; stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; }; @@ -33530,10 +33530,7 @@ with pkgs; transcribe = callPackage ../applications/audio/transcribe { }; - transmission = callPackage ../applications/networking/p2p/transmission { - # https://github.com/NixOS/nixpkgs/issues/207047 - openssl = openssl_legacy; - }; + transmission = callPackage ../applications/networking/p2p/transmission { }; libtransmission = transmission.override { installLib = true; enableDaemon = false; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 89e91b3b95c0..63deb5a1a184 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -20,6 +20,8 @@ self: super: with self; { absl-py = callPackage ../development/python-modules/absl-py { }; + accessible-pygments = callPackage ../development/python-modules/accessible-pygments { }; + accuweather = callPackage ../development/python-modules/accuweather { }; accupy = callPackage ../development/python-modules/accupy { };