diff --git a/doc/Makefile b/doc/Makefile index 570a5d075b31..4f520779f5b2 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -39,6 +39,7 @@ out/html/index.html: doc-support/result manual-full.xml style.css highlightjs mkdir -p out/html/highlightjs/ cp -r highlightjs out/html/ + cp -r media out/html/ cp ./overrides.css out/html/ cp ./style.css out/html/style.css @@ -53,6 +54,7 @@ out/epub/manual.epub: manual-full.xml doc-support/result/epub.xsl \ ./manual-full.xml + cp -r media out/epub/scratch/OEBPS cp ./overrides.css out/epub/scratch/OEBPS cp ./style.css out/epub/scratch/OEBPS mkdir -p out/epub/scratch/OEBPS/images/callouts/ @@ -88,11 +90,15 @@ functions/library/generated: doc-support/result %.section.xml: %.section.md pandoc $^ -t docbook \ + --extract-media=media \ + --lua-filter=$(PANDOC_LUA_FILTERS_DIR)/diagram-generator.lua \ -f markdown+smart \ | cat > $@ %.chapter.xml: %.chapter.md pandoc $^ -t docbook \ --top-level-division=chapter \ + --extract-media=media \ + --lua-filter=$(PANDOC_LUA_FILTERS_DIR)/diagram-generator.lua \ -f markdown+smart \ | cat > $@ diff --git a/doc/contributing/submitting-changes.chapter.md b/doc/contributing/submitting-changes.chapter.md index 984169f0954b..40fc5ea78921 100644 --- a/doc/contributing/submitting-changes.chapter.md +++ b/doc/contributing/submitting-changes.chapter.md @@ -159,6 +159,25 @@ The last checkbox is fits [CONTRIBUTING.md](https://github.com/NixOS/nixpkgs/blo - Hydra builds for master and staging should not be used as testing platform, it’s a build farm for changes that have been already tested. - When changing the bootloader installation process, extra care must be taken. Grub installations cannot be rolled back, hence changes may break people’s installations forever. For any non-trivial change to the bootloader please file a PR asking for review, especially from \@edolstra. +```{.graphviz caption="Staging workflow"} +digraph { + "small changes" [shape=none] + "mass-rebuilds and other large changes" [shape=none] + "critical security fixes" [shape=none] + "broken staging-next fixes" [shape=none] + + "small changes" -> master + "mass-rebuilds and other large changes" -> staging + "critical security fixes" -> master + "broken staging-next fixes" -> "staging-next" + + "staging-next" -> master [color="#E85EB0"] [label="stabilization ends"] [fontcolor="#E85EB0"] + "staging" -> "staging-next" [color="#E85EB0"] [label="stabilization starts"] [fontcolor="#E85EB0"] + + master -> "staging-next" -> staging [color="#5F5EE8"] [label="every six hours/any time"] [fontcolor="#5F5EE8"] +} +``` + ### Master branch {#submitting-changes-master-branch} The `master` branch is the main development branch. It should only see non-breaking commits that do not cause mass rebuilds. diff --git a/doc/default.nix b/doc/default.nix index d9051167dee5..543a3874170b 100644 --- a/doc/default.nix +++ b/doc/default.nix @@ -5,10 +5,22 @@ let in pkgs.stdenv.mkDerivation { name = "nixpkgs-manual"; - buildInputs = with pkgs; [ pandoc libxml2 libxslt zip jing xmlformat ]; + nativeBuildInputs = with pkgs; [ + pandoc + graphviz + libxml2 + libxslt + zip + jing + xmlformat + ]; src = ./.; + makeFlags = [ + "PANDOC_LUA_FILTERS_DIR=${pkgs.pandoc-lua-filters}/share/pandoc/filters" + ]; + postPatch = '' ln -s ${doc-support} ./doc-support/result ''; diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 17f880c426ef..31093cc4d73b 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -384,6 +384,12 @@ githubId = 2822871; name = "Alistair Bill"; }; + alirezameskin = { + email = "alireza.meskin@gmail.com"; + github = "alirezameskin"; + githubId = 36147; + name = "Alireza Meskin"; + }; alkeryn = { email = "plbraundev@gmail.com"; github = "Alkeryn"; diff --git a/nixos/tests/podman.nix b/nixos/tests/podman.nix index dd28563dc4c1..bccd2de7c9b9 100644 --- a/nixos/tests/podman.nix +++ b/nixos/tests/podman.nix @@ -61,12 +61,6 @@ import ./make-test-python.nix ( podman.succeed("podman stop sleeping") podman.succeed("podman rm sleeping") - - podman.succeed( - "mkdir -p /tmp/podman-run-1000/libpod && chown alice -R /tmp/podman-run-1000" - ) - - with subtest("Run container rootless with crun"): podman.succeed(su_cmd("tar cv --files-from /dev/null | podman import - scratchimg")) podman.succeed( diff --git a/pkgs/applications/editors/standardnotes/default.nix b/pkgs/applications/editors/standardnotes/default.nix index 18d9338f9093..e019814b3d67 100644 --- a/pkgs/applications/editors/standardnotes/default.nix +++ b/pkgs/applications/editors/standardnotes/default.nix @@ -2,22 +2,22 @@ , fetchurl, runtimeShell }: let - version = "3.3.3"; + version = "3.5.11"; pname = "standardnotes"; name = "${pname}-${version}"; plat = { i386-linux = "-i386"; - x86_64-linux = ""; + x86_64-linux = "x86_64"; }.${stdenv.hostPlatform.system}; sha256 = { - i386-linux = "2ccdf23588b09d645811e562d4fd7e02ac0e367bf2b34e373d8470d48544036d"; - x86_64-linux = "6366d0a37cbf2cf51008a666e40bada763dd1539173de01e093bcbe4146a6bd8"; + i386-linux = "009fnnd7ysxkyykkbmhvr0vn13b21j1j5mzwdvqdkhm9v3c9rbgj"; + x86_64-linux = "1fij00d03ky57jlnhf9n2iqvfa4dgmkgawrxd773gg03hdsk7xcf"; }.${stdenv.hostPlatform.system}; src = fetchurl { - url = "https://github.com/standardnotes/desktop/releases/download/v${version}/standard-notes-${version}${plat}.AppImage"; + url = "https://github.com/standardnotes/desktop/releases/download/v${version}/standard-notes-${version}-linux-${plat}.AppImage"; inherit sha256; }; diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix index a1e39cfebe0e..558112763a23 100644 --- a/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -14,8 +14,8 @@ let else throw "ImageMagick is not supported on this platform."; cfg = { - version = "7.0.10-35"; - sha256 = "0hcqvn3n3ip2fia48d1nb1m4r5ir00vbaa62xqni30kglh3n2sfh"; + version = "7.0.10-46"; + sha256 = "019l1qv8ds8hvyjwi1g21293a7v28bxf8ycnvr9828kpdhf4jxaa"; patches = []; }; in diff --git a/pkgs/applications/misc/zktree/default.nix b/pkgs/applications/misc/zktree/default.nix new file mode 100644 index 000000000000..fe7b42dcc94d --- /dev/null +++ b/pkgs/applications/misc/zktree/default.nix @@ -0,0 +1,25 @@ +{ lib +, fetchFromGitHub +, rustPlatform +}: + +rustPlatform.buildRustPackage rec { + pname = "zktree"; + version = "0.0.1"; + + src = fetchFromGitHub { + owner = "alirezameskin"; + repo = "zktree"; + rev = version; + sha256 = "11w86k1w5zryiq6bqr98pjhffd3l76377yz53qx0n76vc5374fk9"; + }; + + cargoSha256 = "1d35jrxvhf7m04s1kh0yrfhy9j9i6qzwbw2mwapgsrcsr5vhxasn"; + + meta = with lib; { + description = "A small tool to display Znodes in Zookeeper in tree structure."; + homepage = "https://github.com/alirezameskin/zktree"; + license = licenses.unlicense; + maintainers = with lib.maintainers; [ alirezameskin ]; + }; +} diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix index dd56efe60f83..cd32c80f74eb 100644 --- a/pkgs/applications/virtualization/podman/default.nix +++ b/pkgs/applications/virtualization/podman/default.nix @@ -16,13 +16,13 @@ buildGoModule rec { pname = "podman"; - version = "2.2.0"; + version = "2.2.1"; src = fetchFromGitHub { owner = "containers"; repo = "podman"; rev = "v${version}"; - sha256 = "13na6ms0dapcmfb4pg8z3sds9nprr1lyyjs0v2izqifcyb1r1c00"; + sha256 = "166ch73pqx76ppfkhfg3zqxr71jf5pk5asl5bb5rwhyzf7f057q5"; }; vendorSha256 = null; diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix index 3ebf409f0308..53b9bc5d7382 100644 --- a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix @@ -65,13 +65,13 @@ let in stdenv.mkDerivation rec { pname = "gnome-shell"; - version = "3.38.1"; + version = "3.38.2"; outputs = [ "out" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gnome-shell/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1d0br74gxwnqbh102yjkszkc6fc4yd6p5lcs6bxcpi33chly72dp"; + sha256 = "05fm7kxyvws2lbb156wfa2wf4xmkxr49rrjxg0yaxf68v000yq2k"; }; patches = [ diff --git a/pkgs/desktops/gnome-3/games/gnome-chess/default.nix b/pkgs/desktops/gnome-3/games/gnome-chess/default.nix index d2f9cfaa2dd1..17ac13ebbce1 100644 --- a/pkgs/desktops/gnome-3/games/gnome-chess/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-chess/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "gnome-chess"; - version = "3.38.0"; + version = "3.38.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-chess/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "10y248xdjx9b0izxii9fjyvkra65jxfx66ivwznmn0cadda9gdqg"; + sha256 = "1bpmi5p5vvjdq2rlm5x9k4gpci8jbrjvdxr1q62h5znzq0vz0w0l"; }; nativeBuildInputs = [ meson ninja vala pkgconfig gettext itstool libxml2 python3 wrapGAppsHook gobject-introspection ]; diff --git a/pkgs/development/libraries/rapidcheck/default.nix b/pkgs/development/libraries/rapidcheck/default.nix index bf96e8e76b87..492e12289781 100644 --- a/pkgs/development/libraries/rapidcheck/default.nix +++ b/pkgs/development/libraries/rapidcheck/default.nix @@ -13,8 +13,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; + # Install the extras headers postInstall = '' - cp ../extras/boost_test/include/rapidcheck/boost_test.h $out/include/rapidcheck + cp -r $src/extras $out + chmod -R +w $out/extras + rm $out/extras/CMakeLists.txt + rm $out/extras/**/CMakeLists.txt ''; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/azure-mgmt-cdn/default.nix b/pkgs/development/python-modules/azure-mgmt-cdn/default.nix index 172e33d08cd2..41d0387da2f4 100644 --- a/pkgs/development/python-modules/azure-mgmt-cdn/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-cdn/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-cdn"; - version = "5.1.0"; + version = "5.2.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "5af79f80e6c5f4766bcb5b8c62273445fb2beaeae85c5b9d2ab9aa369d60ede3"; + sha256 = "3e470ba07918a4f97dadb6f50c6f64068da423b735fad38d31d9535c56f06881"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/jupytext/default.nix b/pkgs/development/python-modules/jupytext/default.nix index 6f4c188c2f75..ba627449c123 100644 --- a/pkgs/development/python-modules/jupytext/default.nix +++ b/pkgs/development/python-modules/jupytext/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi, isPy27 -, mock +, markdown-it-py , nbformat , pytest , pyyaml @@ -10,16 +10,19 @@ buildPythonPackage rec { pname = "jupytext"; version = "1.7.1"; + disabled = isPy27; + src = fetchPypi { inherit pname version; sha256 = "23123b90c267c67716fe6a022dfae49b84fd3809370d83211f2920eb3106bf40"; }; propagatedBuildInputs = [ - pyyaml + markdown-it-py nbformat + pyyaml toml - ] ++ lib.optionals isPy27 [ mock ]; # why they put it in install_requires, who knows + ]; checkInputs = [ pytest diff --git a/pkgs/development/python-modules/markdown-it-py/default.nix b/pkgs/development/python-modules/markdown-it-py/default.nix new file mode 100644 index 000000000000..2d915762fca2 --- /dev/null +++ b/pkgs/development/python-modules/markdown-it-py/default.nix @@ -0,0 +1,47 @@ +{ lib, buildPythonPackage, fetchFromGitHub, pytestCheckHook, pythonOlder +, attrs +, coverage +, psutil +, pytest-benchmark +}: + +buildPythonPackage rec { + pname = "markdown-it-py"; + version = "0.5.6"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "executablebooks"; + repo = "markdown-it-py"; + rev = "v${version}"; + sha256 = "1m9g8xvd7jiz80x9hl8bw9x0ppndqq5nlcn5y8bjxnfj5s31vpbi"; + }; + + propagatedBuildInputs = [ attrs ]; + + checkInputs = [ + coverage + pytest-benchmark + psutil + pytestCheckHook + ]; + + disabledTests = [ + # Requires the unpackaged pytest-regressions fixture plugin + "test_amsmath" + "test_container" + "test_deflist" + "test_dollarmath" + "test_spec" + "test_texmath" + ]; + + meta = with lib; { + description = "Markdown parser done right"; + homepage = "https://markdown-it-py.readthedocs.io/en/latest"; + changelog = "https://github.com/executablebooks/markdown-it-py/blob/${src.rev}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ bhipple ]; + }; +} diff --git a/pkgs/development/tools/krew/default.nix b/pkgs/development/tools/krew/default.nix new file mode 100644 index 000000000000..b5fc91b62dda --- /dev/null +++ b/pkgs/development/tools/krew/default.nix @@ -0,0 +1,25 @@ +{ stdenv, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "krew"; + version = "0.4.0"; + + src = fetchFromGitHub { + owner = "kubernetes-sigs"; + repo = "krew"; + rev = "v${version}"; + sha256 = "1fcbpipnbms096c36b2z06ysfwyjj22lm1zd1r5xlv5gp24qimlv"; + }; + + vendorSha256 = "1bmsjv5snrabd9h9szkpcl15rwxm54jgm361ghhy234d2s45c3gn"; + + subPackages = [ "cmd/krew" ]; + + meta = with stdenv.lib; { + description = "Package manager for kubectl plugins"; + homepage = "https://github.com/kubernetes-sigs/krew"; + maintainers = with maintainers; [ vdemeester ]; + license = stdenv.lib.licenses.asl20; + platforms = platforms.unix; + }; +} diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index b80fcb25a855..5ffb9d61a054 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -12,6 +12,17 @@ let # baseExtensions = self: stdenv.lib.mapAttrs (_n: stdenv.lib.recurseIntoAttrs) { + a5huynh.vscode-ron = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-ron"; + publisher = "a5huynh"; + version = "0.9.0"; + sha256 = "0d3p50mhqp550fmj662d3xklj14gvzvhszm2hlqvx4h28v222z97"; + }; + meta = { + license = stdenv.lib.licenses.mit; + }; + }; alanz.vscode-hie-server = buildVscodeMarketplaceExtension { mktplcRef = { @@ -144,6 +155,18 @@ let }; }; + mskelton.one-dark-theme = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "one-dark-theme"; + publisher = "mskelton"; + version = "1.7.2"; + sha256 = "1ks6z8wsxmlfhiwa51f7d6digvw11dlxc7mja3hankgxcf5dyj31"; + }; + meta = { + license = stdenv.lib.licenses.mit; + }; + }; + ms-azuretools.vscode-docker = buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-docker"; @@ -190,6 +213,18 @@ let matklad.rust-analyzer = callPackage ./rust-analyzer {}; + pkief.material-icon-theme = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "material-icon-theme"; + publisher = "pkief"; + version = "4.4.0"; + sha256 = "1m9mis59j9xnf1zvh67p5rhayaa9qxjiw9iw847nyl9vsy73w8ya"; + }; + meta = { + license = stdenv.lib.licenses.mit; + }; + }; + scala-lang.scala = buildVscodeMarketplaceExtension { mktplcRef = { name = "scala"; @@ -214,6 +249,18 @@ let }; }; + serayuzgur.crates = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "crates"; + publisher = "serayuzgur"; + version = "0.5.3"; + sha256 = "1xk7ayv590hsm3scqpyh6962kvgdlinnpkx0vapr7vs4y08dx72f"; + }; + meta = { + license = stdenv.lib.licenses.mit; + }; + }; + skyapps.fish-vscode = buildVscodeMarketplaceExtension { mktplcRef = { name = "fish-vscode"; @@ -226,6 +273,18 @@ let }; }; + tamasfe.even-better-toml = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "even-better-toml"; + publisher = "tamasfe"; + version = "0.9.3"; + sha256 = "16x2y58hkankazpwm93j8lqdn3mala7iayck548kki9zx4qrhhck"; + }; + meta = { + license = stdenv.lib.licenses.mit; + }; + }; + vadimcn.vscode-lldb = callPackage ./vscode-lldb { lldb = llvmPackages_latest.lldb; }; diff --git a/pkgs/tools/admin/mycli/default.nix b/pkgs/tools/admin/mycli/default.nix index 4745d065be93..01b82dde4d51 100644 --- a/pkgs/tools/admin/mycli/default.nix +++ b/pkgs/tools/admin/mycli/default.nix @@ -1,6 +1,7 @@ { lib , python3 , glibcLocales +, fetchpatch }: with python3.pkgs; @@ -28,7 +29,21 @@ buildPythonApplication rec { --ignore=mycli/packages/paramiko_stub/__init__.py ''; - meta = { + patches = [ + # TODO: remove with next release (v1.22.3 or v1.23) + (fetchpatch { + url = "https://github.com/dbcli/mycli/commit/17f093d7b70ab2d9f3c6eababa041bf76f029aac.patch"; + sha256 = "sha256-VwfbtzUtElV+ErH+NJb+3pRtSaF0yVK8gEWCvlzZNHI="; + excludes = [ "changelog.md" "mycli/AUTHORS" ]; + }) + ]; + + postPatch = '' + substituteInPlace setup.py \ + --replace "sqlparse>=0.3.0,<0.4.0" "sqlparse" + ''; + + meta = with lib; { inherit version; description = "Command-line interface for MySQL"; longDescription = '' @@ -36,7 +51,7 @@ buildPythonApplication rec { syntax highlighting. ''; homepage = "http://mycli.net"; - license = lib.licenses.bsd3; - maintainers = [ lib.maintainers.jojosch ]; + license = licenses.bsd3; + maintainers = with maintainers; [ jojosch ]; }; } diff --git a/pkgs/tools/misc/pandoc-lua-filters/default.nix b/pkgs/tools/misc/pandoc-lua-filters/default.nix new file mode 100644 index 000000000000..b7c081c1ddd0 --- /dev/null +++ b/pkgs/tools/misc/pandoc-lua-filters/default.nix @@ -0,0 +1,33 @@ +{ stdenv +, fetchFromGitHub +}: + +stdenv.mkDerivation rec { + pname = "pandoc-lua-filters"; + version = "2020-11-30"; + + src = fetchFromGitHub { + owner = "pandoc"; + repo = "lua-filters"; + rev = "v${version}"; + sha256 = "HWBlmlIuJOSgRVrUmXOAI4XTxs1PbZhcwZgZFX0x2wM="; + }; + + dontBuild = true; + + installPhase = '' + runHook preInstall + + install -Dt $out/share/pandoc/filters **/*.lua + + runHook postInstall + ''; + + meta = with stdenv.lib; { + description = "A collection of lua filters for pandoc"; + homepage = "https://github.com/pandoc/lua-filters"; + license = licenses.mit; + maintainers = with maintainers; [ jtojnar ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/tools/package-management/apk-tools/default.nix b/pkgs/tools/package-management/apk-tools/default.nix index 33c08636e44d..c1141362f820 100644 --- a/pkgs/tools/package-management/apk-tools/default.nix +++ b/pkgs/tools/package-management/apk-tools/default.nix @@ -32,5 +32,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ qyliss ]; license = licenses.gpl2; platforms = platforms.unix; + broken = stdenv.isDarwin; }; } diff --git a/pkgs/tools/virtualization/alpine-make-vm-image/default.nix b/pkgs/tools/virtualization/alpine-make-vm-image/default.nix index d6dad6433e7a..239a00a665d8 100644 --- a/pkgs/tools/virtualization/alpine-make-vm-image/default.nix +++ b/pkgs/tools/virtualization/alpine-make-vm-image/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "alpine-make-vm-image"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "alpinelinux"; repo = "alpine-make-vm-image"; rev = "v${version}"; - sha256 = "0955kd2ddqfynjwk2xfzys96l7abxp30hhrs2968hl78rhmkvpnq"; + sha256 = "0cjcwq957nsml06kdnnvgzki84agjfvqw3mpyiix4i4q5by91lcl"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/virtualization/nixos-shell/default.nix b/pkgs/tools/virtualization/nixos-shell/default.nix index 0c6d7e7b9bb8..d529986c5d46 100644 --- a/pkgs/tools/virtualization/nixos-shell/default.nix +++ b/pkgs/tools/virtualization/nixos-shell/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "nixos-shell"; - version = "0.1.1"; + version = "0.2"; src = fetchFromGitHub { owner = "Mic92"; repo = "nixos-shell"; rev = version; - sha256 = "1qk5a01vh6wbbkib8xr57w1j4l3n6xdjd46nsw9bsa444fzlc0wr"; + sha256 = "sha256-C0K20X0P4SYQV+xtQAUcEiX32kr3IF1RoYdkJ4R3aRM="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5a536122b4b4..cbcadefcb340 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6380,6 +6380,8 @@ in pandoc = callPackage ../development/tools/pandoc { }; + pandoc-lua-filters = callPackage ../tools/misc/pandoc-lua-filters { }; + pamtester = callPackage ../tools/security/pamtester { }; paperless = callPackage ../applications/office/paperless { }; @@ -11655,6 +11657,9 @@ in khronos-ocl-icd-loader = callPackage ../development/libraries/khronos-ocl-icd-loader { }; + + krew = callPackage ../development/tools/krew { }; + kube-aws = callPackage ../development/tools/kube-aws { }; kubectx = callPackage ../development/tools/kubectx { }; @@ -28870,4 +28875,6 @@ in psftools = callPackage ../os-specific/linux/psftools {}; lc3tools = callPackage ../development/tools/lc3tools {}; + + zktree = callPackage ../applications/misc/zktree {}; } diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 34165a22dece..2ff6441631c9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3703,6 +3703,8 @@ in { else callPackage ../development/python-modules/markdown/3_1.nix { }; + markdown-it-py = callPackage ../development/python-modules/markdown-it-py { }; + markdown-macros = callPackage ../development/python-modules/markdown-macros { }; markdownsuperscript = callPackage ../development/python-modules/markdownsuperscript { };