diff options
Diffstat (limited to 'nixpkgs/pkgs/tools/nix')
17 files changed, 27 insertions, 13 deletions
diff --git a/nixpkgs/pkgs/tools/nix/cached-nix-shell/default.nix b/nixpkgs/pkgs/tools/nix/cached-nix-shell/default.nix index 0cbf0f6b106d..84672a8e96a3 100644 --- a/nixpkgs/pkgs/tools/nix/cached-nix-shell/default.nix +++ b/nixpkgs/pkgs/tools/nix/cached-nix-shell/default.nix @@ -38,6 +38,7 @@ in rustPlatform.buildRustPackage rec { meta = with lib; { description = "Instant startup time for nix-shell"; + mainProgram = "cached-nix-shell"; homepage = "https://github.com/xzfc/cached-nix-shell"; license = with licenses; [ unlicense /* or */ mit ]; maintainers = with maintainers; [ xzfc ]; diff --git a/nixpkgs/pkgs/tools/nix/dnadd/default.nix b/nixpkgs/pkgs/tools/nix/dnadd/default.nix index 59a0516629e1..eccda0bd7c5f 100644 --- a/nixpkgs/pkgs/tools/nix/dnadd/default.nix +++ b/nixpkgs/pkgs/tools/nix/dnadd/default.nix @@ -17,6 +17,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/joelancaster/dnadd"; description = "Adds packages declaratively on the command line"; + mainProgram = "dnadd"; license = licenses.gpl3Plus; maintainers = with maintainers; [ joelancaster ]; }; diff --git a/nixpkgs/pkgs/tools/nix/nar-serve/default.nix b/nixpkgs/pkgs/tools/nix/nar-serve/default.nix index f2c709a2e312..98e480d4fdb9 100644 --- a/nixpkgs/pkgs/tools/nix/nar-serve/default.nix +++ b/nixpkgs/pkgs/tools/nix/nar-serve/default.nix @@ -19,6 +19,7 @@ buildGoModule rec { meta = with lib; { description = "Serve NAR file contents via HTTP"; + mainProgram = "nar-serve"; homepage = "https://github.com/numtide/nar-serve"; license = licenses.mit; maintainers = with maintainers; [ rizary zimbatm ]; diff --git a/nixpkgs/pkgs/tools/nix/nix-init/default.nix b/nixpkgs/pkgs/tools/nix/nix-init/default.nix index 1e1ef3c0d0f6..95164ba3963d 100644 --- a/nixpkgs/pkgs/tools/nix/nix-init/default.nix +++ b/nixpkgs/pkgs/tools/nix/nix-init/default.nix @@ -88,6 +88,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Command line tool to generate Nix packages from URLs"; + mainProgram = "nix-init"; homepage = "https://github.com/nix-community/nix-init"; changelog = "https://github.com/nix-community/nix-init/blob/${src.rev}/CHANGELOG.md"; license = licenses.mpl20; diff --git a/nixpkgs/pkgs/tools/nix/nix-melt/default.nix b/nixpkgs/pkgs/tools/nix/nix-melt/default.nix index 3a0b15c8c97f..50f830cf42a0 100644 --- a/nixpkgs/pkgs/tools/nix/nix-melt/default.nix +++ b/nixpkgs/pkgs/tools/nix/nix-melt/default.nix @@ -32,6 +32,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "A ranger-like flake.lock viewer"; + mainProgram = "nix-melt"; homepage = "https://github.com/nix-community/nix-melt"; changelog = "https://github.com/nix-community/nix-melt/blob/${src.rev}/CHANGELOG.md"; license = licenses.mpl20; diff --git a/nixpkgs/pkgs/tools/nix/nix-output-monitor/generated-package.nix b/nixpkgs/pkgs/tools/nix/nix-output-monitor/generated-package.nix index 7c41b6e1b6af..35b1f473cb2d 100644 --- a/nixpkgs/pkgs/tools/nix/nix-output-monitor/generated-package.nix +++ b/nixpkgs/pkgs/tools/nix/nix-output-monitor/generated-package.nix @@ -9,10 +9,10 @@ }: mkDerivation { pname = "nix-output-monitor"; - version = "2.1.1"; + version = "2.1.2"; src = fetchzip { - url = "https://code.maralorn.de/maralorn/nix-output-monitor/archive/v2.1.1.tar.gz"; - sha256 = "1k1gdx7yczz7xm096i8lk09zq6yw1yj8izx6czymfd4qqwj2y49l"; + url = "https://code.maralorn.de/maralorn/nix-output-monitor/archive/v2.1.2.tar.gz"; + sha256 = "192h67myibpc2bw5ng60qi4m9jyjd9cf14aba4ps44ayjw95wkc0"; }; isLibrary = true; isExecutable = true; diff --git a/nixpkgs/pkgs/tools/nix/nix-query-tree-viewer/default.nix b/nixpkgs/pkgs/tools/nix/nix-query-tree-viewer/default.nix index a27aa8d3c3bd..03fa64545f18 100644 --- a/nixpkgs/pkgs/tools/nix/nix-query-tree-viewer/default.nix +++ b/nixpkgs/pkgs/tools/nix/nix-query-tree-viewer/default.nix @@ -24,6 +24,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "GTK viewer for the output of `nix store --query --tree`"; + mainProgram = "nix-query-tree-viewer"; homepage = "https://github.com/cdepillabout/nix-query-tree-viewer"; license = with licenses; [ mit ]; maintainers = with maintainers; [ cdepillabout ]; diff --git a/nixpkgs/pkgs/tools/nix/nix-store-gcs-proxy/default.nix b/nixpkgs/pkgs/tools/nix/nix-store-gcs-proxy/default.nix index 166fe75766de..c83d44101b5b 100644 --- a/nixpkgs/pkgs/tools/nix/nix-store-gcs-proxy/default.nix +++ b/nixpkgs/pkgs/tools/nix/nix-store-gcs-proxy/default.nix @@ -16,6 +16,7 @@ buildGoModule rec { meta = { description = "A HTTP nix store that proxies requests to Google Storage"; + mainProgram = "nix-store-gcs-proxy"; homepage = "https://github.com/tweag/nix-store-gcs-proxy"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ zimbatm ]; diff --git a/nixpkgs/pkgs/tools/nix/nixdoc/default.nix b/nixpkgs/pkgs/tools/nix/nixdoc/default.nix index 1d5014a1c700..616ee90d9a3f 100644 --- a/nixpkgs/pkgs/tools/nix/nixdoc/default.nix +++ b/nixpkgs/pkgs/tools/nix/nixdoc/default.nix @@ -2,26 +2,28 @@ rustPlatform.buildRustPackage rec { pname = "nixdoc"; - version = "3.0.1"; + version = "3.0.2"; src = fetchFromGitHub { owner = "nix-community"; repo = "nixdoc"; rev = "v${version}"; - sha256 = "sha256-PnvVGw0DMBg/l7+QpcXW5AFfR6MeXBiUYdVAZuue1jA="; + sha256 = "sha256-V3MAvbdYk3DL064UYcJE9HmwfQBwpMxVXWiAKX6honA="; }; - cargoHash = "sha256-qLTUyhoEVtjgh+ilEv+pQLXLYWlW9gVsCiA5rPfymZY="; + cargoHash = "sha256-RFxTjLiJCEc42Mb8rcayOFHkYk2GfpgsO3+hAaRwHgs="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.Security ]; meta = with lib; { description = "Generate documentation for Nix functions"; + mainProgram = "nixdoc"; homepage = "https://github.com/nix-community/nixdoc"; license = [ licenses.gpl3 ]; maintainers = with maintainers; [ infinisil asymmetric + hsjobeki ]; platforms = platforms.unix; }; diff --git a/nixpkgs/pkgs/tools/nix/nixel/default.nix b/nixpkgs/pkgs/tools/nix/nixel/default.nix index 5ce14a8d312f..70a0d92101d2 100644 --- a/nixpkgs/pkgs/tools/nix/nixel/default.nix +++ b/nixpkgs/pkgs/tools/nix/nixel/default.nix @@ -29,6 +29,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Lexer, Parser, Abstract Syntax Tree and Concrete Syntax Tree for the Nix Expressions Language"; + mainProgram = "nixel"; homepage = "https://github.com/kamadorueda/nixel"; license = licenses.agpl3Only; maintainers = with maintainers; [ kamadorueda ]; diff --git a/nixpkgs/pkgs/tools/nix/nixos-render-docs/default.nix b/nixpkgs/pkgs/tools/nix/nixos-render-docs/default.nix index b08abfe069f7..43a953f76d9c 100644 --- a/nixpkgs/pkgs/tools/nix/nixos-render-docs/default.nix +++ b/nixpkgs/pkgs/tools/nix/nixos-render-docs/default.nix @@ -61,6 +61,7 @@ python.pkgs.buildPythonApplication rec { meta = with lib; { description = "Renderer for NixOS manual and option docs"; + mainProgram = "nixos-render-docs"; license = licenses.mit; maintainers = [ ]; }; diff --git a/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/html.py b/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/html.py index b9227814dea2..2e43a6a2be87 100644 --- a/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/html.py +++ b/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/html.py @@ -163,7 +163,7 @@ class HTMLRenderer(Renderer): # keycap-styled spans. (id_part, class_part) = ("", "") if s := token.attrs.get('id'): - id_part = f'<a id="{escape(cast(str, s), True)}" />' + id_part = f'<span id="{escape(cast(str, s), True)}"></span>' if s := token.attrs.get('class'): if s == 'keycap': class_part = '<span class="keycap"><strong>' @@ -181,7 +181,7 @@ class HTMLRenderer(Renderer): if hstyle: hstyle = f'style="{escape(hstyle, True)}"' if anchor := cast(str, token.attrs.get('id', '')): - anchor = f'<a id="{escape(anchor, True)}"></a>' + anchor = f'id="{escape(anchor, True)}"' result = self._close_headings(hlevel) tag = self._heading_tag(token, tokens, i) toc_fragment = self._build_toc(tokens, i) @@ -192,8 +192,7 @@ class HTMLRenderer(Renderer): f' <div class="titlepage">' f' <div>' f' <div>' - f' <{htag} class="title" {hstyle}>' - f' {anchor}' + f' <{htag} {anchor} class="title" {hstyle}>' ) def heading_close(self, token: Token, tokens: Sequence[Token], i: int) -> str: heading = self._headings[-1] @@ -220,7 +219,7 @@ class HTMLRenderer(Renderer): def example_open(self, token: Token, tokens: Sequence[Token], i: int) -> str: if id := cast(str, token.attrs.get('id', '')): id = f'id="{escape(id, True)}"' if id else '' - return f'<div class="example"><a {id} />' + return f'<div class="example"><span {id} ></span>' def example_close(self, token: Token, tokens: Sequence[Token], i: int) -> str: return '</div></div><br class="example-break" />' def example_title_open(self, token: Token, tokens: Sequence[Token], i: int) -> str: @@ -239,7 +238,7 @@ class HTMLRenderer(Renderer): ) def figure_open(self, token: Token, tokens: Sequence[Token], i: int) -> str: if anchor := cast(str, token.attrs.get('id', '')): - anchor = f'<a id="{escape(anchor, True)}"></a>' + anchor = f'<span id="{escape(anchor, True)}"></span>' return f'<div class="figure">{anchor}' def figure_close(self, token: Token, tokens: Sequence[Token], i: int) -> str: return ( diff --git a/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/tests/test_html.py b/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/tests/test_html.py index fba0ce2679a4..9a3e07cb24c7 100644 --- a/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/tests/test_html.py +++ b/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/tests/test_html.py @@ -167,7 +167,7 @@ def test_full() -> None: <span class="citerefentry"><span class="refentrytitle">man</span>(1)</span> </a> reference </p> - <p><a id="b" />some <a id="a" />nested anchors</p> + <p><span id="b"></span>some <span id="a"></span>nested anchors</p> <p> <span class="emphasis"><em>emph</em></span>␣ <span class="strong"><strong>strong</strong></span>␣ diff --git a/nixpkgs/pkgs/tools/nix/nixpkgs-lint/default.nix b/nixpkgs/pkgs/tools/nix/nixpkgs-lint/default.nix index 16e7582d3a92..d5e17cd46b37 100644 --- a/nixpkgs/pkgs/tools/nix/nixpkgs-lint/default.nix +++ b/nixpkgs/pkgs/tools/nix/nixpkgs-lint/default.nix @@ -18,6 +18,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "A fast semantic linter for Nix using tree-sitter"; + mainProgram = "nixpkgs-lint"; homepage = "https://github.com/nix-community/nixpkgs-lint"; changelog = "https://github.com/nix-community/nixpkgs-lint/releases/tag/${src.rev}"; license = licenses.mit; diff --git a/nixpkgs/pkgs/tools/nix/npins/default.nix b/nixpkgs/pkgs/tools/nix/npins/default.nix index e83617da91e4..02ec39094ddf 100644 --- a/nixpkgs/pkgs/tools/nix/npins/default.nix +++ b/nixpkgs/pkgs/tools/nix/npins/default.nix @@ -33,6 +33,7 @@ in rustPlatform.buildRustPackage rec { meta = with lib; { description = "Simple and convenient dependency pinning for Nix"; + mainProgram = "npins"; homepage = "https://github.com/andir/npins"; license = licenses.eupl12; maintainers = with maintainers; [ piegames ]; diff --git a/nixpkgs/pkgs/tools/nix/rnix-hashes/default.nix b/nixpkgs/pkgs/tools/nix/rnix-hashes/default.nix index 4aebb35bc935..b9a98b184fb8 100644 --- a/nixpkgs/pkgs/tools/nix/rnix-hashes/default.nix +++ b/nixpkgs/pkgs/tools/nix/rnix-hashes/default.nix @@ -23,6 +23,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Nix Hash Converter"; + mainProgram = "rnix-hashes"; homepage = "https://github.com/numtide/rnix-hashes"; license = licenses.asl20; maintainers = with maintainers; [ rizary SuperSandro2000 ]; diff --git a/nixpkgs/pkgs/tools/nix/zon2nix/default.nix b/nixpkgs/pkgs/tools/nix/zon2nix/default.nix index 78b7d601906c..d3f0bd6ce54a 100644 --- a/nixpkgs/pkgs/tools/nix/zon2nix/default.nix +++ b/nixpkgs/pkgs/tools/nix/zon2nix/default.nix @@ -30,6 +30,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Convert the dependencies in `build.zig.zon` to a Nix expression"; + mainProgram = "zon2nix"; homepage = "https://github.com/nix-community/zon2nix"; changelog = "https://github.com/nix-community/zon2nix/blob/${src.rev}/CHANGELOG.md"; license = licenses.mpl20; |