home

My NixOS systems configurations.
Log | Files | Refs | LICENSE

commit 2014744049c0f345eb6e14f4b6ce0bd3463e1db1
parent 3baa30e1d9f6c2e08d1d8edba66a8f09c562524e
Author: Vincent Demeester <vincent@sbr.pm>
Date:   Fri,  1 Dec 2023 12:46:29 +0100

Remove deprecated sugarjazy package

Signed-off-by: Vincent Demeester <vincent@sbr.pm>

Diffstat:
Mnix/packages/default.nix | 1-
Dnix/packages/sugarjazy/default.nix | 24------------------------
Dnix/packages/sugarjazy/poetry.lock | 155-------------------------------------------------------------------------------
Dnix/packages/sugarjazy/pyproject.toml | 34----------------------------------
Musers/vincent/containers/kubernetes.nix | 2+-
Musers/vincent/containers/tekton.nix | 1-
6 files changed, 1 insertion(+), 216 deletions(-)

diff --git a/nix/packages/default.nix b/nix/packages/default.nix @@ -28,7 +28,6 @@ rec { govanityurl = pkgs.callPackage ./govanityurl { }; kss = pkgs.callPackage ./kss { }; batzconverter = pkgs.callPackage ./batzconverter { }; - sugarjazy = pkgs.callPackage ./sugarjazy { }; #kubernix = pkgs.callPackage ./kubernix { }; krew = pkgs.callPackage ./krew { }; kail = pkgs.callPackage ./kail { }; diff --git a/nix/packages/sugarjazy/default.nix b/nix/packages/sugarjazy/default.nix @@ -1,24 +0,0 @@ -{ stdenv, lib, fetchFromGitHub, poetry2nix, python310, python310Packages }: - -poetry2nix.mkPoetryApplication rec { - pname = "sugarjazy"; - version = "0.6.2"; - python = python310; - - projectDir = ./.; - src = fetchFromGitHub { - owner = "chmouel"; - repo = "sugarjazy"; - rev = "${version}"; - sha256 = "sha256-UbYdyfLEsO4ghIiN1BzOdPqEujbRbKqrN2WCRlIj3g4="; - }; - doCheck = false; - - propagatedBuildInputs = [ python310Packages.python-dateutil ]; - - meta = with lib; { - homepage = "https://github.com/chmouel/sugarjazy"; - description = "parse json logs nicely"; - license = licenses.asl20; - }; -} diff --git a/nix/packages/sugarjazy/poetry.lock b/nix/packages/sugarjazy/poetry.lock @@ -1,155 +0,0 @@ -[[package]] -name = "atomicwrites" -version = "1.4.0" -description = "Atomic file writes." -category = "dev" -optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" - -[[package]] -name = "attrs" -version = "21.4.0" -description = "Classes Without Boilerplate" -category = "dev" -optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" - -[package.extras] -dev = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six", "mypy", "pytest-mypy-plugins", "zope.interface", "furo", "sphinx", "sphinx-notfound-page", "pre-commit", "cloudpickle"] -docs = ["furo", "sphinx", "zope.interface", "sphinx-notfound-page"] -tests = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six", "mypy", "pytest-mypy-plugins", "zope.interface", "cloudpickle"] -tests_no_zope = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six", "mypy", "pytest-mypy-plugins", "cloudpickle"] - -[[package]] -name = "colorama" -version = "0.4.4" -description = "Cross-platform colored terminal text." -category = "dev" -optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" - -[[package]] -name = "more-itertools" -version = "8.12.0" -description = "More routines for operating on iterables, beyond itertools" -category = "dev" -optional = false -python-versions = ">=3.5" - -[[package]] -name = "packaging" -version = "21.3" -description = "Core utilities for Python packages" -category = "dev" -optional = false -python-versions = ">=3.6" - -[package.dependencies] -pyparsing = ">=2.0.2,<3.0.5 || >3.0.5" - -[[package]] -name = "pluggy" -version = "0.13.1" -description = "plugin and hook calling mechanisms for python" -category = "dev" -optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" - -[package.extras] -dev = ["pre-commit", "tox"] - -[[package]] -name = "py" -version = "1.11.0" -description = "library with cross-python path, ini-parsing, io, code, log facilities" -category = "dev" -optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" - -[[package]] -name = "pyparsing" -version = "3.0.7" -description = "Python parsing module" -category = "dev" -optional = false -python-versions = ">=3.6" - -[package.extras] -diagrams = ["jinja2", "railroad-diagrams"] - -[[package]] -name = "pytest" -version = "5.4.3" -description = "pytest: simple powerful testing with Python" -category = "dev" -optional = false -python-versions = ">=3.5" - -[package.dependencies] -atomicwrites = {version = ">=1.0", markers = "sys_platform == \"win32\""} -attrs = ">=17.4.0" -colorama = {version = "*", markers = "sys_platform == \"win32\""} -more-itertools = ">=4.0.0" -packaging = "*" -pluggy = ">=0.12,<1.0" -py = ">=1.5.0" -wcwidth = "*" - -[package.extras] -checkqa-mypy = ["mypy (==v0.761)"] -testing = ["argcomplete", "hypothesis (>=3.56)", "mock", "nose", "requests", "xmlschema"] - -[[package]] -name = "wcwidth" -version = "0.2.5" -description = "Measures the displayed width of unicode strings in a terminal" -category = "dev" -optional = false -python-versions = "*" - -[metadata] -lock-version = "1.1" -python-versions = "^3.10" -content-hash = "491a37bfc34281cb87606e36384453db66e94ff9c309c7a34be6f9380c5e9782" - -[metadata.files] -atomicwrites = [ - {file = "atomicwrites-1.4.0-py2.py3-none-any.whl", hash = "sha256:6d1784dea7c0c8d4a5172b6c620f40b6e4cbfdf96d783691f2e1302a7b88e197"}, - {file = "atomicwrites-1.4.0.tar.gz", hash = "sha256:ae70396ad1a434f9c7046fd2dd196fc04b12f9e91ffb859164193be8b6168a7a"}, -] -attrs = [ - {file = "attrs-21.4.0-py2.py3-none-any.whl", hash = "sha256:2d27e3784d7a565d36ab851fe94887c5eccd6a463168875832a1be79c82828b4"}, - {file = "attrs-21.4.0.tar.gz", hash = "sha256:626ba8234211db98e869df76230a137c4c40a12d72445c45d5f5b716f076e2fd"}, -] -colorama = [ - {file = "colorama-0.4.4-py2.py3-none-any.whl", hash = "sha256:9f47eda37229f68eee03b24b9748937c7dc3868f906e8ba69fbcbdd3bc5dc3e2"}, - {file = "colorama-0.4.4.tar.gz", hash = "sha256:5941b2b48a20143d2267e95b1c2a7603ce057ee39fd88e7329b0c292aa16869b"}, -] -more-itertools = [ - {file = "more-itertools-8.12.0.tar.gz", hash = "sha256:7dc6ad46f05f545f900dd59e8dfb4e84a4827b97b3cfecb175ea0c7d247f6064"}, - {file = "more_itertools-8.12.0-py3-none-any.whl", hash = "sha256:43e6dd9942dffd72661a2c4ef383ad7da1e6a3e968a927ad7a6083ab410a688b"}, -] -packaging = [ - {file = "packaging-21.3-py3-none-any.whl", hash = "sha256:ef103e05f519cdc783ae24ea4e2e0f508a9c99b2d4969652eed6a2e1ea5bd522"}, - {file = "packaging-21.3.tar.gz", hash = "sha256:dd47c42927d89ab911e606518907cc2d3a1f38bbd026385970643f9c5b8ecfeb"}, -] -pluggy = [ - {file = "pluggy-0.13.1-py2.py3-none-any.whl", hash = "sha256:966c145cd83c96502c3c3868f50408687b38434af77734af1e9ca461a4081d2d"}, - {file = "pluggy-0.13.1.tar.gz", hash = "sha256:15b2acde666561e1298d71b523007ed7364de07029219b604cf808bfa1c765b0"}, -] -py = [ - {file = "py-1.11.0-py2.py3-none-any.whl", hash = "sha256:607c53218732647dff4acdfcd50cb62615cedf612e72d1724fb1a0cc6405b378"}, - {file = "py-1.11.0.tar.gz", hash = "sha256:51c75c4126074b472f746a24399ad32f6053d1b34b68d2fa41e558e6f4a98719"}, -] -pyparsing = [ - {file = "pyparsing-3.0.7-py3-none-any.whl", hash = "sha256:a6c06a88f252e6c322f65faf8f418b16213b51bdfaece0524c1c1bc30c63c484"}, - {file = "pyparsing-3.0.7.tar.gz", hash = "sha256:18ee9022775d270c55187733956460083db60b37d0d0fb357445f3094eed3eea"}, -] -pytest = [ - {file = "pytest-5.4.3-py3-none-any.whl", hash = "sha256:5c0db86b698e8f170ba4582a492248919255fcd4c79b1ee64ace34301fb589a1"}, - {file = "pytest-5.4.3.tar.gz", hash = "sha256:7979331bfcba207414f5e1263b5a0f8f521d0f457318836a7355531ed1a4c7d8"}, -] -wcwidth = [ - {file = "wcwidth-0.2.5-py2.py3-none-any.whl", hash = "sha256:beb4802a9cebb9144e99086eff703a642a13d6a0052920003a230f3294bbe784"}, - {file = "wcwidth-0.2.5.tar.gz", hash = "sha256:c4d647b99872929fdb7bdcaa4fbe7f01413ed3d98077df798530e5b04f116c83"}, -] diff --git a/nix/packages/sugarjazy/pyproject.toml b/nix/packages/sugarjazy/pyproject.toml @@ -1,34 +0,0 @@ -[tool.poetry] -name = "sugarjazy" -version = "0.6.0" -description = "Parse json logs output from uber-go/zap library nicely" -authors = ["Chmouel Boudjnah <chmouel@chmouel.com>"] -maintainers = ["Chmouel Boudjnah <chmouel@chmouel.com>"] -readme = "README.md" -license = "Apache-2.0" -keywords = ["logs", "tekton", "kubernetes"] -homepage = "https://github.com/chmouel/sugarjazy" -repository = "https://github.com/chmouel/sugarjazy" -classifiers = [ - "License :: OSI Approved :: Apache Software License", -] - -include = [ - "LICENSE" -] - -[tool.poetry.dependencies] -python = "^3.6" - -[tool.poetry.dev-dependencies] -pytest = "^5.2" - -[tool.poetry.scripts] -sugarjazy = "sugarjazy.cli:main" - -[tool.poetry.urls] -issues = "https://github.com/chmouel/sugarjazy/issues" - -[build-system] -requires = ["poetry-core>=1.0.0"] -build-backend = "poetry.core.masonry.api" diff --git a/users/vincent/containers/kubernetes.nix b/users/vincent/containers/kubernetes.nix @@ -27,6 +27,6 @@ in kubectx ]; programs.zsh.initExtra = '' - alias -g SK="|sugarjazy -s --kail --kail-prefix-format='{pod}'" + alias -g SK="|snazy -s --kail --kail-prefix-format='{pod}'" ''; } diff --git a/users/vincent/containers/tekton.nix b/users/vincent/containers/tekton.nix @@ -7,7 +7,6 @@ # my.tkn my.tkn-pac my.tkn-local - # my.sugarjazy rekor-cli cosign ];