From 677f8ae23448ace6f8a91acb25b8cc53b82cfa24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Vask=C3=B3?= <1771332+vlaci@users.noreply.github.com> Date: Fri, 27 Sep 2024 17:40:34 +0200 Subject: [PATCH 01/28] python: adjust wrapper to fix propagating dependencies to virtual envs --- src/modules/languages/python.nix | 2 +- src/python-wrapper.nix | 82 ++++++++++++++++++++++++++++++++ 2 files changed, 83 insertions(+), 1 deletion(-) create mode 100644 src/python-wrapper.nix diff --git a/src/modules/languages/python.nix b/src/modules/languages/python.nix index 9c6aef053..06f92ec49 100644 --- a/src/modules/languages/python.nix +++ b/src/modules/languages/python.nix @@ -10,7 +10,7 @@ let ); readlink = "${pkgs.coreutils}/bin/readlink -f "; - package = pkgs.callPackage "${pkgs.path}/pkgs/development/interpreters/python/wrapper.nix" { + package = pkgs.callPackage ../../python-wrapper.nix { python = cfg.package; requiredPythonModules = cfg.package.pkgs.requiredPythonModules; makeWrapperArgs = [ diff --git a/src/python-wrapper.nix b/src/python-wrapper.nix new file mode 100644 index 000000000..9b0312087 --- /dev/null +++ b/src/python-wrapper.nix @@ -0,0 +1,82 @@ +{ lib, stdenv, buildEnv, makeBinaryWrapper + +# manually pased +, python +, requiredPythonModules + +# extra opts +, extraLibs ? [] +, extraOutputsToInstall ? [] +, postBuild ? "" +, ignoreCollisions ? false +, permitUserSite ? false +# Wrap executables with the given argument. +, makeWrapperArgs ? [] +, }: + +# Create a python executable that knows about additional packages. +let + env = let + paths = requiredPythonModules (extraLibs ++ [ python ] ) ; + pythonPath = "${placeholder "out"}/${python.sitePackages}"; + pythonExecutable = "${placeholder "out"}/bin/${python.executable}"; + in buildEnv { + name = "${python.name}-env"; + + inherit paths; + inherit ignoreCollisions; + extraOutputsToInstall = [ "out" ] ++ extraOutputsToInstall; + + nativeBuildInputs = [ makeBinaryWrapper ]; + + postBuild = '' + if [ -L "$out/bin" ]; then + unlink "$out/bin" + fi + mkdir -p "$out/bin" + + rm -f $out/bin/.*-wrapped + + for path in ${lib.concatStringsSep " " paths}; do + if [ -d "$path/bin" ]; then + cd "$path/bin" + for prg in *; do + if [ -f "$prg" ]; then + rm -f "$out/bin/$prg" + if [ -x "$prg" ]; then + if [ -f ".$prg-wrapped" ]; then + echo "#!${pythonExecutable}" > "$out/bin/$prg" + sed \ + -e '/^#!\/nix\/store\//d' \ + -e '/^import sys;import site;import functools;sys\.argv\[0\] = /d' \ + ".$prg-wrapped" >> "$out/bin/$prg" + chmod +x "$out/bin/$prg" + else + makeWrapper "$path/bin/$prg" "$out/bin/$prg" --inherit-argv0 --resolve-argv0 ${lib.optionalString (!permitUserSite) ''--set PYTHONNOUSERSITE "true"''} ${lib.concatStringsSep " " makeWrapperArgs} + fi + fi + fi + done + fi + done + '' + postBuild; + + inherit (python) meta; + + passthru = python.passthru // { + interpreter = "${env}/bin/${python.executable}"; + inherit python; + env = stdenv.mkDerivation { + name = "interactive-${python.name}-environment"; + nativeBuildInputs = [ env ]; + + buildCommand = '' + echo >&2 "" + echo >&2 "*** Python 'env' attributes are intended for interactive nix-shell sessions, not for building! ***" + echo >&2 "" + exit 1 + ''; + }; + }; + }; +in env From 46b7d941f691032c0b20cc944b1564959c83afa8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Tue, 1 Oct 2024 13:13:50 +0100 Subject: [PATCH 02/28] try out latest nixpkgs --- devenv.lock | 30 +++++++++++++++--------------- devenv/src/flake.tmpl.nix | 2 +- examples/go/devenv.yaml | 2 -- src/modules/services/mongodb.nix | 2 +- 4 files changed, 17 insertions(+), 19 deletions(-) diff --git a/devenv.lock b/devenv.lock index 22ff0bd54..05f5129ce 100644 --- a/devenv.lock +++ b/devenv.lock @@ -51,10 +51,10 @@ ] }, "locked": { - "lastModified": 1726153070, + "lastModified": 1727826117, "owner": "hercules-ci", "repo": "flake-parts", - "rev": "bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a", + "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1", "type": "github" }, "original": { @@ -86,10 +86,10 @@ "libgit2": { "flake": false, "locked": { - "lastModified": 1727433268, + "lastModified": 1727820199, "owner": "libgit2", "repo": "libgit2", - "rev": "d82310318da2137ec88ca2e2b2bca962e111db71", + "rev": "5d48749cc7c95686fad56f52dfdf83a200d135bb", "type": "github" }, "original": { @@ -124,10 +124,10 @@ }, "nixpkgs": { "locked": { - "lastModified": 1727435427, + "lastModified": 1727842732, "owner": "NixOS", "repo": "nixpkgs", - "rev": "9a33680635c55945d01d0b7929beff1356546fe5", + "rev": "24f1a65397b6c1c7c71733f2e68f3ad7b8e6c139", "type": "github" }, "original": { @@ -169,10 +169,10 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1727264057, + "lastModified": 1727672256, "owner": "NixOS", "repo": "nixpkgs", - "rev": "759537f06e6999e141588ff1c9be7f3a5c060106", + "rev": "1719f27dd95fd4206afb9cec9f415b539978827e", "type": "github" }, "original": { @@ -184,15 +184,15 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1716977621, + "lastModified": 1727294711, "owner": "cachix", "repo": "devenv-nixpkgs", - "rev": "4267e705586473d3e5c8d50299e71503f16a6fb6", + "rev": "8a7af3824a78d188f1f8951ed57eca43eb6ac6df", "type": "github" }, "original": { "owner": "cachix", - "ref": "rolling", + "ref": "bump-rolling", "repo": "devenv-nixpkgs", "type": "github" } @@ -215,10 +215,10 @@ ] }, "locked": { - "lastModified": 1726745158, + "lastModified": 1727854478, "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "4e743a6920eab45e8ba0fbe49dc459f1423a4b74", + "rev": "5f58871c9657b5fc0a7f65670fe2ba99c26c1d79", "type": "github" }, "original": { @@ -237,10 +237,10 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1726745158, + "lastModified": 1727854478, "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "4e743a6920eab45e8ba0fbe49dc459f1423a4b74", + "rev": "5f58871c9657b5fc0a7f65670fe2ba99c26c1d79", "type": "github" }, "original": { diff --git a/devenv/src/flake.tmpl.nix b/devenv/src/flake.tmpl.nix index cba4effd7..1d6db18ff 100644 --- a/devenv/src/flake.tmpl.nix +++ b/devenv/src/flake.tmpl.nix @@ -5,7 +5,7 @@ in { pre-commit-hooks.url = "github:cachix/pre-commit-hooks.nix"; pre-commit-hooks.inputs.nixpkgs.follows = "nixpkgs"; - nixpkgs.url = "github:cachix/devenv-nixpkgs/rolling"; + nixpkgs.url = "github:cachix/devenv-nixpkgs/bump-rolling"; devenv.url = "github:cachix/devenv?dir=src/modules"; } // (if builtins.pathExists (devenv_dotfile + "/flake.json") then builtins.fromJSON (builtins.readFile (devenv_dotfile + "/flake.json")) diff --git a/examples/go/devenv.yaml b/examples/go/devenv.yaml index c9ed906e5..ad4cb6291 100644 --- a/examples/go/devenv.yaml +++ b/examples/go/devenv.yaml @@ -1,7 +1,5 @@ # yaml-language-server: $schema=https://devenv.sh/devenv.schema.json inputs: - nixpkgs: - url: github:cachix/devenv-nixpkgs/rolling gomod: url: github:nix-community/gomod2nix overlays: diff --git a/src/modules/services/mongodb.nix b/src/modules/services/mongodb.nix index 60fb0093d..597413751 100644 --- a/src/modules/services/mongodb.nix +++ b/src/modules/services/mongodb.nix @@ -73,7 +73,7 @@ in package = mkOption { type = types.package; description = "Which MongoDB package to use."; - default = pkgs.mongodb; + default = pkgs.mongodb-6_0; defaultText = lib.literalExpression "pkgs.mongodb"; }; From 9eeafdffacbbe77978681b0897bb036f2af201f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sat, 5 Oct 2024 12:28:12 +0100 Subject: [PATCH 03/28] fix python wrapper --- src/python-wrapper.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/python-wrapper.nix b/src/python-wrapper.nix index 9b0312087..aa568a01b 100644 --- a/src/python-wrapper.nix +++ b/src/python-wrapper.nix @@ -46,10 +46,7 @@ let if [ -x "$prg" ]; then if [ -f ".$prg-wrapped" ]; then echo "#!${pythonExecutable}" > "$out/bin/$prg" - sed \ - -e '/^#!\/nix\/store\//d' \ - -e '/^import sys;import site;import functools;sys\.argv\[0\] = /d' \ - ".$prg-wrapped" >> "$out/bin/$prg" + sed -e '1d' -e '3d' ".$prg-wrapped" >> "$out/bin/$prg" chmod +x "$out/bin/$prg" else makeWrapper "$path/bin/$prg" "$out/bin/$prg" --inherit-argv0 --resolve-argv0 ${lib.optionalString (!permitUserSite) ''--set PYTHONNOUSERSITE "true"''} ${lib.concatStringsSep " " makeWrapperArgs} From 66320f46fcd07741d9cd5bfe71cbe2315e148301 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Mon, 7 Oct 2024 14:50:24 +0100 Subject: [PATCH 04/28] fix #1252: set --disable-dotenv for process-compose --- src/modules/process-managers/process-compose.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/src/modules/process-managers/process-compose.nix b/src/modules/process-managers/process-compose.nix index 8660b8184..8a809436f 100644 --- a/src/modules/process-managers/process-compose.nix +++ b/src/modules/process-managers/process-compose.nix @@ -76,6 +76,7 @@ in config = lib.mkIf cfg.enable { process.manager.args = { "config" = cfg.configFile; + "disable-dotenv" = true; "port" = if !cfg.unixSocket.enable then toString cfg.port else null; "unix-socket" = if cfg.unixSocket.enable From b456bac1a51bb838af3c43550587b71fe6be9022 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Tue, 15 Oct 2024 14:59:28 +0100 Subject: [PATCH 05/28] bump nixpkgs --- devenv.lock | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/devenv.lock b/devenv.lock index 05f5129ce..a934e9f66 100644 --- a/devenv.lock +++ b/devenv.lock @@ -86,10 +86,10 @@ "libgit2": { "flake": false, "locked": { - "lastModified": 1727820199, + "lastModified": 1728645207, "owner": "libgit2", "repo": "libgit2", - "rev": "5d48749cc7c95686fad56f52dfdf83a200d135bb", + "rev": "a9aa21476e34679fb7e381d04356c7a94bc698fe", "type": "github" }, "original": { @@ -124,10 +124,10 @@ }, "nixpkgs": { "locked": { - "lastModified": 1727842732, + "lastModified": 1728980750, "owner": "NixOS", "repo": "nixpkgs", - "rev": "24f1a65397b6c1c7c71733f2e68f3ad7b8e6c139", + "rev": "dea2c6565d78ec2c49055e34150f9488a9370b6d", "type": "github" }, "original": { @@ -169,10 +169,10 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1727672256, + "lastModified": 1728740863, "owner": "NixOS", "repo": "nixpkgs", - "rev": "1719f27dd95fd4206afb9cec9f415b539978827e", + "rev": "a3f9ad65a0bf298ed5847629a57808b97e6e8077", "type": "github" }, "original": { @@ -184,15 +184,15 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1727294711, + "lastModified": 1716977621, "owner": "cachix", "repo": "devenv-nixpkgs", - "rev": "8a7af3824a78d188f1f8951ed57eca43eb6ac6df", + "rev": "4267e705586473d3e5c8d50299e71503f16a6fb6", "type": "github" }, "original": { "owner": "cachix", - "ref": "bump-rolling", + "ref": "rolling", "repo": "devenv-nixpkgs", "type": "github" } @@ -215,10 +215,10 @@ ] }, "locked": { - "lastModified": 1727854478, + "lastModified": 1728778939, "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "5f58871c9657b5fc0a7f65670fe2ba99c26c1d79", + "rev": "ff68f91754be6f3427e4986d7949e6273659be1d", "type": "github" }, "original": { @@ -237,10 +237,10 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1727854478, + "lastModified": 1728778939, "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "5f58871c9657b5fc0a7f65670fe2ba99c26c1d79", + "rev": "ff68f91754be6f3427e4986d7949e6273659be1d", "type": "github" }, "original": { From c9f01815de438b8bdcf8ceedca47899f08fbf0a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 16 Oct 2024 16:53:52 +0100 Subject: [PATCH 06/28] format --- devenv.lock | 22 ++++---- devenv.nix | 2 +- src/python-wrapper.nix | 123 ++++++++++++++++++++++------------------- 3 files changed, 77 insertions(+), 70 deletions(-) diff --git a/devenv.lock b/devenv.lock index a934e9f66..c5a1e233a 100644 --- a/devenv.lock +++ b/devenv.lock @@ -124,10 +124,10 @@ }, "nixpkgs": { "locked": { - "lastModified": 1728980750, + "lastModified": 1729078744, "owner": "NixOS", "repo": "nixpkgs", - "rev": "dea2c6565d78ec2c49055e34150f9488a9370b6d", + "rev": "e001b2334526f3aaf32b4a264f6bf274b3859135", "type": "github" }, "original": { @@ -169,10 +169,10 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1728740863, + "lastModified": 1728909085, "owner": "NixOS", "repo": "nixpkgs", - "rev": "a3f9ad65a0bf298ed5847629a57808b97e6e8077", + "rev": "c0b1da36f7c34a7146501f684e9ebdf15d2bebf8", "type": "github" }, "original": { @@ -184,15 +184,15 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1716977621, + "lastModified": 1728972312, "owner": "cachix", "repo": "devenv-nixpkgs", - "rev": "4267e705586473d3e5c8d50299e71503f16a6fb6", + "rev": "60a1d9cc7b914fa2c043c6005390ca7236e863de", "type": "github" }, "original": { "owner": "cachix", - "ref": "rolling", + "ref": "bump-rolling", "repo": "devenv-nixpkgs", "type": "github" } @@ -215,10 +215,10 @@ ] }, "locked": { - "lastModified": 1728778939, + "lastModified": 1729087992, "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "ff68f91754be6f3427e4986d7949e6273659be1d", + "rev": "43983c5976fef25e774e3f1c9bd04f658e9481c3", "type": "github" }, "original": { @@ -237,10 +237,10 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1728778939, + "lastModified": 1729087992, "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "ff68f91754be6f3427e4986d7949e6273659be1d", + "rev": "43983c5976fef25e774e3f1c9bd04f658e9481c3", "type": "github" }, "original": { diff --git a/devenv.nix b/devenv.nix index f061c47b6..acf602fe8 100644 --- a/devenv.nix +++ b/devenv.nix @@ -102,7 +102,7 @@ }; scripts."devenv-generate-doc-css" = { description = "Generate CSS for the docs."; - exec = "${lib.getExe pkgs.tailwindcss} build -i docs/assets/extra.css -o docs/assets/output.css"; + exec = "${lib.getExe pkgs.tailwindcss} build --quiet -i docs/assets/extra.css -o docs/assets/output.css"; }; scripts."devenv-generate-doc-options" = { description = "Generate option docs."; diff --git a/src/python-wrapper.nix b/src/python-wrapper.nix index aa568a01b..dc4de5d67 100644 --- a/src/python-wrapper.nix +++ b/src/python-wrapper.nix @@ -1,79 +1,86 @@ -{ lib, stdenv, buildEnv, makeBinaryWrapper +{ lib +, stdenv +, buildEnv +, makeBinaryWrapper -# manually pased + # manually pased , python , requiredPythonModules -# extra opts -, extraLibs ? [] -, extraOutputsToInstall ? [] + # extra opts +, extraLibs ? [ ] +, extraOutputsToInstall ? [ ] , postBuild ? "" , ignoreCollisions ? false , permitUserSite ? false -# Wrap executables with the given argument. -, makeWrapperArgs ? [] -, }: + # Wrap executables with the given argument. +, makeWrapperArgs ? [ ] +, +}: # Create a python executable that knows about additional packages. let - env = let - paths = requiredPythonModules (extraLibs ++ [ python ] ) ; - pythonPath = "${placeholder "out"}/${python.sitePackages}"; - pythonExecutable = "${placeholder "out"}/bin/${python.executable}"; - in buildEnv { - name = "${python.name}-env"; + env = + let + paths = requiredPythonModules (extraLibs ++ [ python ]); + pythonPath = "${placeholder "out"}/${python.sitePackages}"; + pythonExecutable = "${placeholder "out"}/bin/${python.executable}"; + in + buildEnv { + name = "${python.name}-env"; - inherit paths; - inherit ignoreCollisions; - extraOutputsToInstall = [ "out" ] ++ extraOutputsToInstall; + inherit paths; + inherit ignoreCollisions; + extraOutputsToInstall = [ "out" ] ++ extraOutputsToInstall; - nativeBuildInputs = [ makeBinaryWrapper ]; + nativeBuildInputs = [ makeBinaryWrapper ]; - postBuild = '' - if [ -L "$out/bin" ]; then - unlink "$out/bin" - fi - mkdir -p "$out/bin" + postBuild = '' + if [ -L "$out/bin" ]; then + unlink "$out/bin" + fi + mkdir -p "$out/bin" - rm -f $out/bin/.*-wrapped + rm -f $out/bin/.*-wrapped - for path in ${lib.concatStringsSep " " paths}; do - if [ -d "$path/bin" ]; then - cd "$path/bin" - for prg in *; do - if [ -f "$prg" ]; then - rm -f "$out/bin/$prg" - if [ -x "$prg" ]; then - if [ -f ".$prg-wrapped" ]; then - echo "#!${pythonExecutable}" > "$out/bin/$prg" - sed -e '1d' -e '3d' ".$prg-wrapped" >> "$out/bin/$prg" - chmod +x "$out/bin/$prg" - else - makeWrapper "$path/bin/$prg" "$out/bin/$prg" --inherit-argv0 --resolve-argv0 ${lib.optionalString (!permitUserSite) ''--set PYTHONNOUSERSITE "true"''} ${lib.concatStringsSep " " makeWrapperArgs} + for path in ${lib.concatStringsSep " " paths}; do + if [ -d "$path/bin" ]; then + cd "$path/bin" + for prg in *; do + if [ -f "$prg" ]; then + rm -f "$out/bin/$prg" + if [ -x "$prg" ]; then + if [ -f ".$prg-wrapped" ]; then + echo "#!${pythonExecutable}" > "$out/bin/$prg" + sed -e '1d' -e '3d' ".$prg-wrapped" >> "$out/bin/$prg" + chmod +x "$out/bin/$prg" + else + makeWrapper "$path/bin/$prg" "$out/bin/$prg" --inherit-argv0 --resolve-argv0 ${lib.optionalString (!permitUserSite) ''--set PYTHONNOUSERSITE "true"''} ${lib.concatStringsSep " " makeWrapperArgs} + fi fi fi - fi - done - fi - done - '' + postBuild; + done + fi + done + '' + postBuild; - inherit (python) meta; + inherit (python) meta; - passthru = python.passthru // { - interpreter = "${env}/bin/${python.executable}"; - inherit python; - env = stdenv.mkDerivation { - name = "interactive-${python.name}-environment"; - nativeBuildInputs = [ env ]; + passthru = python.passthru // { + interpreter = "${env}/bin/${python.executable}"; + inherit python; + env = stdenv.mkDerivation { + name = "interactive-${python.name}-environment"; + nativeBuildInputs = [ env ]; - buildCommand = '' - echo >&2 "" - echo >&2 "*** Python 'env' attributes are intended for interactive nix-shell sessions, not for building! ***" - echo >&2 "" - exit 1 - ''; - }; + buildCommand = '' + echo >&2 "" + echo >&2 "*** Python 'env' attributes are intended for interactive nix-shell sessions, not for building! ***" + echo >&2 "" + exit 1 + ''; + }; + }; }; - }; -in env +in +env From f3ff43326a9a4c1ecb207031cc417d59327459e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 16 Oct 2024 17:01:21 +0100 Subject: [PATCH 07/28] fix pre-commit hook --- devenv.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/devenv.nix b/devenv.nix index acf602fe8..163f88e78 100644 --- a/devenv.nix +++ b/devenv.nix @@ -102,7 +102,7 @@ }; scripts."devenv-generate-doc-css" = { description = "Generate CSS for the docs."; - exec = "${lib.getExe pkgs.tailwindcss} build --quiet -i docs/assets/extra.css -o docs/assets/output.css"; + exec = "${lib.getExe pkgs.tailwindcss} build -i docs/assets/extra.css -o docs/assets/output.css 2>/dev/null"; }; scripts."devenv-generate-doc-options" = { description = "Generate option docs."; @@ -231,9 +231,6 @@ EOF generate-doc-css = { enable = true; name = "generate-doc-css"; - # In CI, the auto-commit action doesn't run in the shell, so it can't reuse our scripts. - # And the following command is curently too slow to be a pre-commit command. - # entry = "devenv shell devenv-generate-doc-css"; entry = config.scripts."devenv-generate-doc-css".exec; }; }; From 797565551b151b13685b39eeb64410fbcf53dd5c Mon Sep 17 00:00:00 2001 From: Sander Date: Wed, 16 Oct 2024 23:33:55 +0400 Subject: [PATCH 08/28] dev: bump devenv.lock --- devenv.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/devenv.lock b/devenv.lock index c5a1e233a..2ee7da7cc 100644 --- a/devenv.lock +++ b/devenv.lock @@ -124,10 +124,10 @@ }, "nixpkgs": { "locked": { - "lastModified": 1729078744, + "lastModified": 1729101357, "owner": "NixOS", "repo": "nixpkgs", - "rev": "e001b2334526f3aaf32b4a264f6bf274b3859135", + "rev": "945fecb357f60fa2264165b86453b1084db9740d", "type": "github" }, "original": { @@ -184,15 +184,15 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1728972312, + "lastModified": 1716977621, "owner": "cachix", "repo": "devenv-nixpkgs", - "rev": "60a1d9cc7b914fa2c043c6005390ca7236e863de", + "rev": "4267e705586473d3e5c8d50299e71503f16a6fb6", "type": "github" }, "original": { "owner": "cachix", - "ref": "bump-rolling", + "ref": "rolling", "repo": "devenv-nixpkgs", "type": "github" } @@ -215,10 +215,10 @@ ] }, "locked": { - "lastModified": 1729087992, + "lastModified": 1729104314, "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "43983c5976fef25e774e3f1c9bd04f658e9481c3", + "rev": "3c3e88f0f544d6bb54329832616af7eb971b6be6", "type": "github" }, "original": { @@ -237,10 +237,10 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1729087992, + "lastModified": 1729104314, "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "43983c5976fef25e774e3f1c9bd04f658e9481c3", + "rev": "3c3e88f0f544d6bb54329832616af7eb971b6be6", "type": "github" }, "original": { From 7f3343c064ffbe1a7a79d117b398747407fe2a8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Thu, 17 Oct 2024 11:22:34 +0100 Subject: [PATCH 09/28] fix tailwindcss --- devenv.nix | 6 +- docs/assets/output.css | 1037 +---------------------------- docs/overrides/home.html | 1331 ++++++++++++++++++++++++-------------- 3 files changed, 836 insertions(+), 1538 deletions(-) diff --git a/devenv.nix b/devenv.nix index 163f88e78..99e93cab8 100644 --- a/devenv.nix +++ b/devenv.nix @@ -102,7 +102,7 @@ }; scripts."devenv-generate-doc-css" = { description = "Generate CSS for the docs."; - exec = "${lib.getExe pkgs.tailwindcss} build -i docs/assets/extra.css -o docs/assets/output.css 2>/dev/null"; + exec = "${lib.getExe pkgs.tailwindcss} -m -i docs/assets/extra.css -o docs/assets/output.css"; }; scripts."devenv-generate-doc-options" = { description = "Generate option docs."; @@ -217,10 +217,7 @@ EOF pre-commit.hooks = { nixpkgs-fmt.enable = true; - #shellcheck.enable = true; - #clippy.enable = true; rustfmt.enable = true; - #markdownlint.enable = true; markdownlint.settings.configuration = { MD013 = { line_length = 120; @@ -232,6 +229,7 @@ EOF enable = true; name = "generate-doc-css"; entry = config.scripts."devenv-generate-doc-css".exec; + files = "docs/assets/extra.css"; }; }; } diff --git a/docs/assets/output.css b/docs/assets/output.css index 1da7c9765..4f7d57005 100644 --- a/docs/assets/output.css +++ b/docs/assets/output.css @@ -1,1036 +1 @@ -/* -! tailwindcss v3.4.3 | MIT License | https://tailwindcss.com -*/ - -/* -1. Prevent padding and border from affecting element width. (https://github.com/mozdevs/cssremedy/issues/4) -2. Allow adding a border to an element by just adding a border-width. (https://github.com/tailwindcss/tailwindcss/pull/116) -*/ - -*, -::before, -::after { - box-sizing: border-box; - /* 1 */ - border-width: 0; - /* 2 */ - border-style: solid; - /* 2 */ - border-color: #e5e7eb; - /* 2 */ -} - -::before, -::after { - --tw-content: ''; -} - -/* -1. Use a consistent sensible line-height in all browsers. -2. Prevent adjustments of font size after orientation changes in iOS. -3. Use a more readable tab size. -4. Use the user's configured `sans` font-family by default. -5. Use the user's configured `sans` font-feature-settings by default. -6. Use the user's configured `sans` font-variation-settings by default. -7. Disable tap highlights on iOS -*/ - -html, -:host { - line-height: 1.5; - /* 1 */ - -webkit-text-size-adjust: 100%; - /* 2 */ - -moz-tab-size: 4; - /* 3 */ - -o-tab-size: 4; - tab-size: 4; - /* 3 */ - font-family: ui-sans-serif, system-ui, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"; - /* 4 */ - font-feature-settings: normal; - /* 5 */ - font-variation-settings: normal; - /* 6 */ - -webkit-tap-highlight-color: transparent; - /* 7 */ -} - -/* -1. Remove the margin in all browsers. -2. Inherit line-height from `html` so users can set them as a class directly on the `html` element. -*/ - -body { - margin: 0; - /* 1 */ - line-height: inherit; - /* 2 */ -} - -/* -1. Add the correct height in Firefox. -2. Correct the inheritance of border color in Firefox. (https://bugzilla.mozilla.org/show_bug.cgi?id=190655) -3. Ensure horizontal rules are visible by default. -*/ - -hr { - height: 0; - /* 1 */ - color: inherit; - /* 2 */ - border-top-width: 1px; - /* 3 */ -} - -/* -Add the correct text decoration in Chrome, Edge, and Safari. -*/ - -abbr:where([title]) { - -webkit-text-decoration: underline dotted; - text-decoration: underline dotted; -} - -/* -Remove the default font size and weight for headings. -*/ - -h1, -h2, -h3, -h4, -h5, -h6 { - font-size: inherit; - font-weight: inherit; -} - -/* -Reset links to optimize for opt-in styling instead of opt-out. -*/ - -a { - color: inherit; - text-decoration: inherit; -} - -/* -Add the correct font weight in Edge and Safari. -*/ - -b, -strong { - font-weight: bolder; -} - -/* -1. Use the user's configured `mono` font-family by default. -2. Use the user's configured `mono` font-feature-settings by default. -3. Use the user's configured `mono` font-variation-settings by default. -4. Correct the odd `em` font sizing in all browsers. -*/ - -code, -kbd, -samp, -pre { - font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace; - /* 1 */ - font-feature-settings: normal; - /* 2 */ - font-variation-settings: normal; - /* 3 */ - font-size: 1em; - /* 4 */ -} - -/* -Add the correct font size in all browsers. -*/ - -small { - font-size: 80%; -} - -/* -Prevent `sub` and `sup` elements from affecting the line height in all browsers. -*/ - -sub, -sup { - font-size: 75%; - line-height: 0; - position: relative; - vertical-align: baseline; -} - -sub { - bottom: -0.25em; -} - -sup { - top: -0.5em; -} - -/* -1. Remove text indentation from table contents in Chrome and Safari. (https://bugs.chromium.org/p/chromium/issues/detail?id=999088, https://bugs.webkit.org/show_bug.cgi?id=201297) -2. Correct table border color inheritance in all Chrome and Safari. (https://bugs.chromium.org/p/chromium/issues/detail?id=935729, https://bugs.webkit.org/show_bug.cgi?id=195016) -3. Remove gaps between table borders by default. -*/ - -table { - text-indent: 0; - /* 1 */ - border-color: inherit; - /* 2 */ - border-collapse: collapse; - /* 3 */ -} - -/* -1. Change the font styles in all browsers. -2. Remove the margin in Firefox and Safari. -3. Remove default padding in all browsers. -*/ - -button, -input, -optgroup, -select, -textarea { - font-family: inherit; - /* 1 */ - font-feature-settings: inherit; - /* 1 */ - font-variation-settings: inherit; - /* 1 */ - font-size: 100%; - /* 1 */ - font-weight: inherit; - /* 1 */ - line-height: inherit; - /* 1 */ - letter-spacing: inherit; - /* 1 */ - color: inherit; - /* 1 */ - margin: 0; - /* 2 */ - padding: 0; - /* 3 */ -} - -/* -Remove the inheritance of text transform in Edge and Firefox. -*/ - -button, -select { - text-transform: none; -} - -/* -1. Correct the inability to style clickable types in iOS and Safari. -2. Remove default button styles. -*/ - -button, -input:where([type='button']), -input:where([type='reset']), -input:where([type='submit']) { - -webkit-appearance: button; - /* 1 */ - background-color: transparent; - /* 2 */ - background-image: none; - /* 2 */ -} - -/* -Use the modern Firefox focus style for all focusable elements. -*/ - -:-moz-focusring { - outline: auto; -} - -/* -Remove the additional `:invalid` styles in Firefox. (https://github.com/mozilla/gecko-dev/blob/2f9eacd9d3d995c937b4251a5557d95d494c9be1/layout/style/res/forms.css#L728-L737) -*/ - -:-moz-ui-invalid { - box-shadow: none; -} - -/* -Add the correct vertical alignment in Chrome and Firefox. -*/ - -progress { - vertical-align: baseline; -} - -/* -Correct the cursor style of increment and decrement buttons in Safari. -*/ - -::-webkit-inner-spin-button, -::-webkit-outer-spin-button { - height: auto; -} - -/* -1. Correct the odd appearance in Chrome and Safari. -2. Correct the outline style in Safari. -*/ - -[type='search'] { - -webkit-appearance: textfield; - /* 1 */ - outline-offset: -2px; - /* 2 */ -} - -/* -Remove the inner padding in Chrome and Safari on macOS. -*/ - -::-webkit-search-decoration { - -webkit-appearance: none; -} - -/* -1. Correct the inability to style clickable types in iOS and Safari. -2. Change font properties to `inherit` in Safari. -*/ - -::-webkit-file-upload-button { - -webkit-appearance: button; - /* 1 */ - font: inherit; - /* 2 */ -} - -/* -Add the correct display in Chrome and Safari. -*/ - -summary { - display: list-item; -} - -/* -Removes the default spacing and border for appropriate elements. -*/ - -blockquote, -dl, -dd, -h1, -h2, -h3, -h4, -h5, -h6, -hr, -figure, -p, -pre { - margin: 0; -} - -fieldset { - margin: 0; - padding: 0; -} - -legend { - padding: 0; -} - -ol, -ul, -menu { - list-style: none; - margin: 0; - padding: 0; -} - -/* -Reset default styling for dialogs. -*/ - -dialog { - padding: 0; -} - -/* -Prevent resizing textareas horizontally by default. -*/ - -textarea { - resize: vertical; -} - -/* -1. Reset the default placeholder opacity in Firefox. (https://github.com/tailwindlabs/tailwindcss/issues/3300) -2. Set the default placeholder color to the user's configured gray 400 color. -*/ - -input::-moz-placeholder, textarea::-moz-placeholder { - opacity: 1; - /* 1 */ - color: #9ca3af; - /* 2 */ -} - -input::placeholder, -textarea::placeholder { - opacity: 1; - /* 1 */ - color: #9ca3af; - /* 2 */ -} - -/* -Set the default cursor for buttons. -*/ - -button, -[role="button"] { - cursor: pointer; -} - -/* -Make sure disabled buttons don't get the pointer cursor. -*/ - -:disabled { - cursor: default; -} - -/* -1. Make replaced elements `display: block` by default. (https://github.com/mozdevs/cssremedy/issues/14) -2. Add `vertical-align: middle` to align replaced elements more sensibly by default. (https://github.com/jensimmons/cssremedy/issues/14#issuecomment-634934210) - This can trigger a poorly considered lint error in some tools but is included by design. -*/ - -img, -svg, -video, -canvas, -audio, -iframe, -embed, -object { - display: block; - /* 1 */ - vertical-align: middle; - /* 2 */ -} - -/* -Constrain images and videos to the parent width and preserve their intrinsic aspect ratio. (https://github.com/mozdevs/cssremedy/issues/14) -*/ - -img, -video { - max-width: 100%; - height: auto; -} - -/* Make elements with the HTML hidden attribute stay hidden by default */ - -[hidden] { - display: none; -} - -html { - font-size: 20px; -} - -*, ::before, ::after { - --tw-border-spacing-x: 0; - --tw-border-spacing-y: 0; - --tw-translate-x: 0; - --tw-translate-y: 0; - --tw-rotate: 0; - --tw-skew-x: 0; - --tw-skew-y: 0; - --tw-scale-x: 1; - --tw-scale-y: 1; - --tw-pan-x: ; - --tw-pan-y: ; - --tw-pinch-zoom: ; - --tw-scroll-snap-strictness: proximity; - --tw-gradient-from-position: ; - --tw-gradient-via-position: ; - --tw-gradient-to-position: ; - --tw-ordinal: ; - --tw-slashed-zero: ; - --tw-numeric-figure: ; - --tw-numeric-spacing: ; - --tw-numeric-fraction: ; - --tw-ring-inset: ; - --tw-ring-offset-width: 0px; - --tw-ring-offset-color: #fff; - --tw-ring-color: rgb(59 130 246 / 0.5); - --tw-ring-offset-shadow: 0 0 #0000; - --tw-ring-shadow: 0 0 #0000; - --tw-shadow: 0 0 #0000; - --tw-shadow-colored: 0 0 #0000; - --tw-blur: ; - --tw-brightness: ; - --tw-contrast: ; - --tw-grayscale: ; - --tw-hue-rotate: ; - --tw-invert: ; - --tw-saturate: ; - --tw-sepia: ; - --tw-drop-shadow: ; - --tw-backdrop-blur: ; - --tw-backdrop-brightness: ; - --tw-backdrop-contrast: ; - --tw-backdrop-grayscale: ; - --tw-backdrop-hue-rotate: ; - --tw-backdrop-invert: ; - --tw-backdrop-opacity: ; - --tw-backdrop-saturate: ; - --tw-backdrop-sepia: ; - --tw-contain-size: ; - --tw-contain-layout: ; - --tw-contain-paint: ; - --tw-contain-style: ; -} - -::backdrop { - --tw-border-spacing-x: 0; - --tw-border-spacing-y: 0; - --tw-translate-x: 0; - --tw-translate-y: 0; - --tw-rotate: 0; - --tw-skew-x: 0; - --tw-skew-y: 0; - --tw-scale-x: 1; - --tw-scale-y: 1; - --tw-pan-x: ; - --tw-pan-y: ; - --tw-pinch-zoom: ; - --tw-scroll-snap-strictness: proximity; - --tw-gradient-from-position: ; - --tw-gradient-via-position: ; - --tw-gradient-to-position: ; - --tw-ordinal: ; - --tw-slashed-zero: ; - --tw-numeric-figure: ; - --tw-numeric-spacing: ; - --tw-numeric-fraction: ; - --tw-ring-inset: ; - --tw-ring-offset-width: 0px; - --tw-ring-offset-color: #fff; - --tw-ring-color: rgb(59 130 246 / 0.5); - --tw-ring-offset-shadow: 0 0 #0000; - --tw-ring-shadow: 0 0 #0000; - --tw-shadow: 0 0 #0000; - --tw-shadow-colored: 0 0 #0000; - --tw-blur: ; - --tw-brightness: ; - --tw-contrast: ; - --tw-grayscale: ; - --tw-hue-rotate: ; - --tw-invert: ; - --tw-saturate: ; - --tw-sepia: ; - --tw-drop-shadow: ; - --tw-backdrop-blur: ; - --tw-backdrop-brightness: ; - --tw-backdrop-contrast: ; - --tw-backdrop-grayscale: ; - --tw-backdrop-hue-rotate: ; - --tw-backdrop-invert: ; - --tw-backdrop-opacity: ; - --tw-backdrop-saturate: ; - --tw-backdrop-sepia: ; - --tw-contain-size: ; - --tw-contain-layout: ; - --tw-contain-paint: ; - --tw-contain-style: ; -} - -.container { - width: 100%; -} - -@media (min-width: 640px) { - .container { - max-width: 640px; - } -} - -@media (min-width: 768px) { - .container { - max-width: 768px; - } -} - -@media (min-width: 1024px) { - .container { - max-width: 1024px; - } -} - -@media (min-width: 1280px) { - .container { - max-width: 1280px; - } -} - -@media (min-width: 1536px) { - .container { - max-width: 1536px; - } -} - -.language-shell::before { - content: attr(data-shell-prefix); - margin-inline-end: 0.4rem; - --tw-text-opacity: 1; - color: rgb(147 197 253 / var(--tw-text-opacity)); -} - -.static { - position: static; -} - -.relative { - position: relative; -} - -.isolate { - isolation: isolate; -} - -.mx-auto { - margin-left: auto; - margin-right: auto; -} - -.mb-6 { - margin-bottom: 1.2rem; -} - -.mt-10 { - margin-top: 2rem; -} - -.mt-2 { - margin-top: 0.4rem; -} - -.mt-4 { - margin-top: 0.8rem; -} - -.mt-6 { - margin-top: 1.2rem; -} - -.block { - display: block; -} - -.inline { - display: inline; -} - -.flex { - display: flex; -} - -.grid { - display: grid; -} - -.h-8 { - height: 1.6rem; -} - -.max-w-2xl { - max-width: 33.6rem; -} - -.max-w-3xl { - max-width: 38.4rem; -} - -.max-w-7xl { - max-width: 64rem; -} - -.max-w-xl { - max-width: 28.8rem; -} - -.grid-cols-1 { - grid-template-columns: repeat(1, minmax(0, 1fr)); -} - -.items-center { - align-items: center; -} - -.justify-center { - justify-content: center; -} - -.gap-x-6 { - -moz-column-gap: 1.2rem; - column-gap: 1.2rem; -} - -.gap-x-8 { - -moz-column-gap: 1.6rem; - column-gap: 1.6rem; -} - -.gap-y-16 { - row-gap: 3.2rem; -} - -.space-y-8 > :not([hidden]) ~ :not([hidden]) { - --tw-space-y-reverse: 0; - margin-top: calc(1.6rem * calc(1 - var(--tw-space-y-reverse))); - margin-bottom: calc(1.6rem * var(--tw-space-y-reverse)); -} - -.overflow-hidden { - overflow: hidden; -} - -.truncate { - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; -} - -.rounded-md { - border-radius: 0.3rem; -} - -.rounded-b-xl { - border-bottom-right-radius: 0.6rem; - border-bottom-left-radius: 0.6rem; -} - -.border-b { - border-bottom-width: 1px; -} - -.border-r { - border-right-width: 1px; -} - -.border-t { - border-top-width: 1px; -} - -.border-b-white\/20 { - border-bottom-color: rgb(255 255 255 / 0.2); -} - -.border-r-white\/10 { - border-right-color: rgb(255 255 255 / 0.1); -} - -.border-t-white\/20 { - border-top-color: rgb(255 255 255 / 0.2); -} - -.bg-black { - --tw-bg-opacity: 1; - background-color: rgb(0 0 0 / var(--tw-bg-opacity)); -} - -.bg-gray-100 { - --tw-bg-opacity: 1; - background-color: rgb(243 244 246 / var(--tw-bg-opacity)); -} - -.bg-gray-800\/40 { - background-color: rgb(31 41 55 / 0.4); -} - -.bg-gray-900 { - --tw-bg-opacity: 1; - background-color: rgb(17 24 39 / var(--tw-bg-opacity)); -} - -.bg-white { - --tw-bg-opacity: 1; - background-color: rgb(255 255 255 / var(--tw-bg-opacity)); -} - -.bg-white\/5 { - background-color: rgb(255 255 255 / 0.05); -} - -.p-1 { - padding: 0.2rem; -} - -.px-2 { - padding-left: 0.4rem; - padding-right: 0.4rem; -} - -.px-3 { - padding-left: 0.6rem; - padding-right: 0.6rem; -} - -.px-3\.5 { - padding-left: 0.7rem; - padding-right: 0.7rem; -} - -.px-4 { - padding-left: 0.8rem; - padding-right: 0.8rem; -} - -.py-14 { - padding-top: 2.8rem; - padding-bottom: 2.8rem; -} - -.py-2 { - padding-top: 0.4rem; - padding-bottom: 0.4rem; -} - -.py-2\.5 { - padding-top: 0.5rem; - padding-bottom: 0.5rem; -} - -.py-8 { - padding-top: 1.6rem; - padding-bottom: 1.6rem; -} - -.pt-14 { - padding-top: 2.8rem; -} - -.text-center { - text-align: center; -} - -.text-2xl { - font-size: 1.2rem; - line-height: 1.6rem; -} - -.text-3xl { - font-size: 1.5rem; - line-height: 1.8rem; -} - -.text-base { - font-size: 0.8rem; - line-height: 1.2rem; -} - -.text-lg { - font-size: 0.9rem; - line-height: 1.4rem; -} - -.text-sm { - font-size: 0.7rem; - line-height: 1rem; -} - -.text-xl { - font-size: 1rem; - line-height: 1.4rem; -} - -.font-bold { - font-weight: 700; -} - -.font-medium { - font-weight: 500; -} - -.font-semibold { - font-weight: 600; -} - -.leading-6 { - line-height: 1.2rem; -} - -.leading-7 { - line-height: 1.4rem; -} - -.leading-8 { - line-height: 1.6rem; -} - -.tracking-tight { - letter-spacing: -0.025em; -} - -.text-\[\#425C82\] { - --tw-text-opacity: 1; - color: rgb(66 92 130 / var(--tw-text-opacity)); -} - -.text-black { - --tw-text-opacity: 1; - color: rgb(0 0 0 / var(--tw-text-opacity)); -} - -.text-gray-200 { - --tw-text-opacity: 1; - color: rgb(229 231 235 / var(--tw-text-opacity)); -} - -.text-gray-600 { - --tw-text-opacity: 1; - color: rgb(75 85 99 / var(--tw-text-opacity)); -} - -.text-gray-800 { - --tw-text-opacity: 1; - color: rgb(31 41 55 / var(--tw-text-opacity)); -} - -.text-gray-900 { - --tw-text-opacity: 1; - color: rgb(17 24 39 / var(--tw-text-opacity)); -} - -.text-white { - --tw-text-opacity: 1; - color: rgb(255 255 255 / var(--tw-text-opacity)); -} - -.shadow-sm { - --tw-shadow: 0 1px 2px 0 rgb(0 0 0 / 0.05); - --tw-shadow-colored: 0 1px 2px 0 var(--tw-shadow-color); - box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow); -} - -.filter { - filter: var(--tw-blur) var(--tw-brightness) var(--tw-contrast) var(--tw-grayscale) var(--tw-hue-rotate) var(--tw-invert) var(--tw-saturate) var(--tw-sepia) var(--tw-drop-shadow); -} - -/* mobile make code snippets scrollable */ - -.image-wrapper { - overflow: auto!important; -} - -/* add some whitespace under hero CTA button */ - -.md-main__inner { - padding-bottom: 1rem; -} - -.hover\:to-\[\#425C82\]:hover { - --tw-gradient-to: #425C82 var(--tw-gradient-to-position); -} - -.focus-visible\:outline:focus-visible { - outline-style: solid; -} - -.focus-visible\:outline-2:focus-visible { - outline-width: 2px; -} - -.focus-visible\:outline-offset-2:focus-visible { - outline-offset: 2px; -} - -.focus-visible\:outline-indigo-400:focus-visible { - outline-color: #818cf8; -} - -@media (min-width: 640px) { - .sm\:mx-0 { - margin-left: 0px; - margin-right: 0px; - } - - .sm\:mx-auto { - margin-left: auto; - margin-right: auto; - } - - .sm\:max-w-2xl { - max-width: 33.6rem; - } - - .sm\:max-w-none { - max-width: none; - } - - .sm\:gap-y-20 { - row-gap: 4rem; - } - - .sm\:text-4xl { - font-size: 1.8rem; - line-height: 2rem; - } -} - -@media (min-width: 768px) { - .md\:px-6 { - padding-left: 1.2rem; - padding-right: 1.2rem; - } -} - -@media (min-width: 1024px) { - .lg\:mx-0 { - margin-left: 0px; - margin-right: 0px; - } - - .lg\:max-w-lg { - max-width: 25.6rem; - } - - .lg\:max-w-none { - max-width: none; - } - - .lg\:grid-cols-2 { - grid-template-columns: repeat(2, minmax(0, 1fr)); - } - - .lg\:items-start { - align-items: flex-start; - } - - .lg\:px-0 { - padding-left: 0px; - padding-right: 0px; - } - - .lg\:px-8 { - padding-left: 1.6rem; - padding-right: 1.6rem; - } - - .lg\:pl-3 { - padding-left: 0.6rem; - } -} +*,:after,:before{--tw-border-spacing-x:0;--tw-border-spacing-y:0;--tw-translate-x:0;--tw-translate-y:0;--tw-rotate:0;--tw-skew-x:0;--tw-skew-y:0;--tw-scale-x:1;--tw-scale-y:1;--tw-pan-x: ;--tw-pan-y: ;--tw-pinch-zoom: ;--tw-scroll-snap-strictness:proximity;--tw-gradient-from-position: ;--tw-gradient-via-position: ;--tw-gradient-to-position: ;--tw-ordinal: ;--tw-slashed-zero: ;--tw-numeric-figure: ;--tw-numeric-spacing: ;--tw-numeric-fraction: ;--tw-ring-inset: ;--tw-ring-offset-width:0px;--tw-ring-offset-color:#fff;--tw-ring-color:rgba(59,130,246,.5);--tw-ring-offset-shadow:0 0 #0000;--tw-ring-shadow:0 0 #0000;--tw-shadow:0 0 #0000;--tw-shadow-colored:0 0 #0000;--tw-blur: ;--tw-brightness: ;--tw-contrast: ;--tw-grayscale: ;--tw-hue-rotate: ;--tw-invert: ;--tw-saturate: ;--tw-sepia: ;--tw-drop-shadow: ;--tw-backdrop-blur: ;--tw-backdrop-brightness: ;--tw-backdrop-contrast: ;--tw-backdrop-grayscale: ;--tw-backdrop-hue-rotate: ;--tw-backdrop-invert: ;--tw-backdrop-opacity: ;--tw-backdrop-saturate: ;--tw-backdrop-sepia: ;--tw-contain-size: ;--tw-contain-layout: ;--tw-contain-paint: ;--tw-contain-style: }::backdrop{--tw-border-spacing-x:0;--tw-border-spacing-y:0;--tw-translate-x:0;--tw-translate-y:0;--tw-rotate:0;--tw-skew-x:0;--tw-skew-y:0;--tw-scale-x:1;--tw-scale-y:1;--tw-pan-x: ;--tw-pan-y: ;--tw-pinch-zoom: ;--tw-scroll-snap-strictness:proximity;--tw-gradient-from-position: ;--tw-gradient-via-position: ;--tw-gradient-to-position: ;--tw-ordinal: ;--tw-slashed-zero: ;--tw-numeric-figure: ;--tw-numeric-spacing: ;--tw-numeric-fraction: ;--tw-ring-inset: ;--tw-ring-offset-width:0px;--tw-ring-offset-color:#fff;--tw-ring-color:rgba(59,130,246,.5);--tw-ring-offset-shadow:0 0 #0000;--tw-ring-shadow:0 0 #0000;--tw-shadow:0 0 #0000;--tw-shadow-colored:0 0 #0000;--tw-blur: ;--tw-brightness: ;--tw-contrast: ;--tw-grayscale: ;--tw-hue-rotate: ;--tw-invert: ;--tw-saturate: ;--tw-sepia: ;--tw-drop-shadow: ;--tw-backdrop-blur: ;--tw-backdrop-brightness: ;--tw-backdrop-contrast: ;--tw-backdrop-grayscale: ;--tw-backdrop-hue-rotate: ;--tw-backdrop-invert: ;--tw-backdrop-opacity: ;--tw-backdrop-saturate: ;--tw-backdrop-sepia: ;--tw-contain-size: ;--tw-contain-layout: ;--tw-contain-paint: ;--tw-contain-style: }/*! tailwindcss v3.4.13 | MIT License | https://tailwindcss.com*/*,:after,:before{border:0 solid #e5e7eb;box-sizing:border-box}:after,:before{--tw-content:""}:host,html{line-height:1.5;-webkit-text-size-adjust:100%;font-family:ui-sans-serif,system-ui,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol,Noto Color Emoji;font-feature-settings:normal;font-variation-settings:normal;-moz-tab-size:4;-o-tab-size:4;tab-size:4;-webkit-tap-highlight-color:transparent}body{line-height:inherit;margin:0}hr{border-top-width:1px;color:inherit;height:0}abbr:where([title]){-webkit-text-decoration:underline dotted;text-decoration:underline dotted}h1,h2,h3,h4,h5,h6{font-size:inherit;font-weight:inherit}a{color:inherit;text-decoration:inherit}b,strong{font-weight:bolder}code,kbd,pre,samp{font-family:ui-monospace,SFMono-Regular,Menlo,Monaco,Consolas,Liberation Mono,Courier New,monospace;font-feature-settings:normal;font-size:1em;font-variation-settings:normal}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sub{bottom:-.25em}sup{top:-.5em}table{border-collapse:collapse;border-color:inherit;text-indent:0}button,input,optgroup,select,textarea{color:inherit;font-family:inherit;font-feature-settings:inherit;font-size:100%;font-variation-settings:inherit;font-weight:inherit;letter-spacing:inherit;line-height:inherit;margin:0;padding:0}button,select{text-transform:none}button,input:where([type=button]),input:where([type=reset]),input:where([type=submit]){-webkit-appearance:button;background-color:transparent;background-image:none}:-moz-focusring{outline:auto}:-moz-ui-invalid{box-shadow:none}progress{vertical-align:baseline}::-webkit-inner-spin-button,::-webkit-outer-spin-button{height:auto}[type=search]{-webkit-appearance:textfield;outline-offset:-2px}::-webkit-search-decoration{-webkit-appearance:none}::-webkit-file-upload-button{-webkit-appearance:button;font:inherit}summary{display:list-item}blockquote,dd,dl,figure,h1,h2,h3,h4,h5,h6,hr,p,pre{margin:0}fieldset{margin:0}fieldset,legend{padding:0}menu,ol,ul{list-style:none;margin:0;padding:0}dialog{padding:0}textarea{resize:vertical}input::-moz-placeholder,textarea::-moz-placeholder{color:#9ca3af;opacity:1}input::placeholder,textarea::placeholder{color:#9ca3af;opacity:1}[role=button],button{cursor:pointer}:disabled{cursor:default}audio,canvas,embed,iframe,img,object,svg,video{display:block;vertical-align:middle}img,video{height:auto;max-width:100%}[hidden]{display:none}html{font-size:20px}.container{width:100%}@media (min-width:640px){.container{max-width:640px}}@media (min-width:768px){.container{max-width:768px}}@media (min-width:1024px){.container{max-width:1024px}}@media (min-width:1280px){.container{max-width:1280px}}@media (min-width:1536px){.container{max-width:1536px}}.language-shell:before{content:attr(data-shell-prefix);margin-inline-end:.4rem;--tw-text-opacity:1;color:rgb(147 197 253/var(--tw-text-opacity))}.static{position:static}.relative{position:relative}.isolate{isolation:isolate}.mx-auto{margin-left:auto;margin-right:auto}.mb-6{margin-bottom:1.2rem}.mt-10{margin-top:2rem}.mt-2{margin-top:.4rem}.mt-4{margin-top:.8rem}.mt-6{margin-top:1.2rem}.block{display:block}.inline{display:inline}.flex{display:flex}.grid{display:grid}.h-8{height:1.6rem}.max-w-2xl{max-width:33.6rem}.max-w-3xl{max-width:38.4rem}.max-w-7xl{max-width:64rem}.max-w-xl{max-width:28.8rem}.grid-cols-1{grid-template-columns:repeat(1,minmax(0,1fr))}.items-center{align-items:center}.justify-center{justify-content:center}.gap-x-6{-moz-column-gap:1.2rem;column-gap:1.2rem}.gap-x-8{-moz-column-gap:1.6rem;column-gap:1.6rem}.gap-y-16{row-gap:3.2rem}.space-y-8>:not([hidden])~:not([hidden]){--tw-space-y-reverse:0;margin-bottom:calc(1.6rem*var(--tw-space-y-reverse));margin-top:calc(1.6rem*(1 - var(--tw-space-y-reverse)))}.overflow-hidden,.truncate{overflow:hidden}.truncate{text-overflow:ellipsis;white-space:nowrap}.rounded-md{border-radius:.3rem}.rounded-b-xl{border-bottom-left-radius:.6rem;border-bottom-right-radius:.6rem}.border-b{border-bottom-width:1px}.border-r{border-right-width:1px}.border-t{border-top-width:1px}.border-b-white\/20{border-bottom-color:hsla(0,0%,100%,.2)}.border-r-white\/10{border-right-color:hsla(0,0%,100%,.1)}.border-t-white\/20{border-top-color:hsla(0,0%,100%,.2)}.bg-black{--tw-bg-opacity:1;background-color:rgb(0 0 0/var(--tw-bg-opacity))}.bg-gray-100{--tw-bg-opacity:1;background-color:rgb(243 244 246/var(--tw-bg-opacity))}.bg-gray-800\/40{background-color:rgba(31,41,55,.4)}.bg-gray-900{--tw-bg-opacity:1;background-color:rgb(17 24 39/var(--tw-bg-opacity))}.bg-white{--tw-bg-opacity:1;background-color:rgb(255 255 255/var(--tw-bg-opacity))}.bg-white\/5{background-color:hsla(0,0%,100%,.05)}.p-1{padding:.2rem}.px-2{padding-left:.4rem;padding-right:.4rem}.px-3\.5{padding-left:.7rem;padding-right:.7rem}.px-4{padding-left:.8rem;padding-right:.8rem}.py-14{padding-bottom:2.8rem;padding-top:2.8rem}.py-2\.5{padding-bottom:.5rem;padding-top:.5rem}.py-8{padding-bottom:1.6rem;padding-top:1.6rem}.pt-14{padding-top:2.8rem}.text-center{text-align:center}.text-2xl{font-size:1.2rem;line-height:1.6rem}.text-3xl{font-size:1.5rem;line-height:1.8rem}.text-base{font-size:.8rem;line-height:1.2rem}.text-lg{font-size:.9rem;line-height:1.4rem}.text-sm{font-size:.7rem;line-height:1rem}.text-xl{font-size:1rem;line-height:1.4rem}.font-bold{font-weight:700}.font-medium{font-weight:500}.font-semibold{font-weight:600}.leading-6{line-height:1.2rem}.leading-7{line-height:1.4rem}.leading-8{line-height:1.6rem}.tracking-tight{letter-spacing:-.025em}.text-\[\#425C82\]{--tw-text-opacity:1;color:rgb(66 92 130/var(--tw-text-opacity))}.text-black{--tw-text-opacity:1;color:rgb(0 0 0/var(--tw-text-opacity))}.text-gray-200{--tw-text-opacity:1;color:rgb(229 231 235/var(--tw-text-opacity))}.text-gray-600{--tw-text-opacity:1;color:rgb(75 85 99/var(--tw-text-opacity))}.text-gray-800{--tw-text-opacity:1;color:rgb(31 41 55/var(--tw-text-opacity))}.text-gray-900{--tw-text-opacity:1;color:rgb(17 24 39/var(--tw-text-opacity))}.text-white{--tw-text-opacity:1;color:rgb(255 255 255/var(--tw-text-opacity))}.shadow-sm{--tw-shadow:0 1px 2px 0 rgba(0,0,0,.05);--tw-shadow-colored:0 1px 2px 0 var(--tw-shadow-color);box-shadow:var(--tw-ring-offset-shadow,0 0 #0000),var(--tw-ring-shadow,0 0 #0000),var(--tw-shadow)}.filter{filter:var(--tw-blur) var(--tw-brightness) var(--tw-contrast) var(--tw-grayscale) var(--tw-hue-rotate) var(--tw-invert) var(--tw-saturate) var(--tw-sepia) var(--tw-drop-shadow)}.image-wrapper{overflow:auto!important}.md-main__inner{padding-bottom:1rem}.hover\:to-\[\#425C82\]:hover{--tw-gradient-to:#425c82 var(--tw-gradient-to-position)}.focus-visible\:outline:focus-visible{outline-style:solid}.focus-visible\:outline-2:focus-visible{outline-width:2px}.focus-visible\:outline-offset-2:focus-visible{outline-offset:2px}.focus-visible\:outline-indigo-400:focus-visible{outline-color:#818cf8}@media (min-width:640px){.sm\:mx-0{margin-left:0;margin-right:0}.sm\:mx-auto{margin-left:auto;margin-right:auto}.sm\:max-w-2xl{max-width:33.6rem}.sm\:max-w-none{max-width:none}.sm\:gap-y-20{row-gap:4rem}.sm\:text-4xl{font-size:1.8rem;line-height:2rem}}@media (min-width:768px){.md\:px-6{padding-left:1.2rem;padding-right:1.2rem}}@media (min-width:1024px){.lg\:mx-0{margin-left:0;margin-right:0}.lg\:max-w-lg{max-width:25.6rem}.lg\:max-w-none{max-width:none}.lg\:grid-cols-2{grid-template-columns:repeat(2,minmax(0,1fr))}.lg\:items-start{align-items:flex-start}.lg\:px-0{padding-left:0;padding-right:0}.lg\:px-8{padding-left:1.6rem;padding-right:1.6rem}.lg\:pl-3{padding-left:.6rem}} \ No newline at end of file diff --git a/docs/overrides/home.html b/docs/overrides/home.html index 3cbde9ca8..5a3bcf5ba 100644 --- a/docs/overrides/home.html +++ b/docs/overrides/home.html @@ -1,117 +1,181 @@ -{% extends "main.html" %} - -{% block styles %} -{{ super () }} - +{% extends "main.html" %} {% block styles %} {{ super () }} + -{% endblock %} - -{% block hero %} +{% endblock %} {% block hero %}
-
-
-

Fast, Declarative, Reproducible and Composable - Developer Environments using Nix

-

- Develop natively - • Deploy containers - • 100.000+ packages - • Write scripts and - tasks - • 50+ supported languages - • Define processes - • Reuse services - • Run tests - • Enforce git hooks -

-
- Get - started -
+
+
+

+ Fast, Declarative, Reproducible and Composable Developer + Environments using Nix +

+

+ Develop + natively + • Deploy + containers + • 100.000+ + packages + • Write + scripts + and + tasks + • 50+ + supported languages + • Define + processes + • Reuse + services + • Run + tests • + Enforce + git hooks +

+
+ Get started +
+
-
-
-
-
-
-
-

Simple JSON-like language

-

- Declaratively define your development environment by toggling basic options. -

-
-
- Environment variables. -
-
- Use env attribute set to define environment variables. - -

If you'd like to also include secrets from .env - file, set dotenv.enable = true;.

-
-
-
-
- Packages. -
-
- Pick from 80000+ prebuilt packages for - Linux/macOS and X64/Arm64. Works with WSL2. -
-
-
- Run script(s) when entering the environment. -
-
- Prepare your environment when entering the shell that has environment already loaded. -
-
-
-
- Automatically load the environment when entering the project. -
-
- Using direnv will automatically load the environment when you enter the project - directory. -
-
-
-
-
-
-
-
-
-
-
-
- devenv.nix
+
+
+
+
+

+ Simple JSON-like language +

+

+ Declaratively define your development environment by + toggling basic options. +

+ +
+
+
+ Environment variables. +
+
+ Use + env + attribute set to define environment variables. + +

+ If you'd like to also include secrets from + .env + file, set + dotenv.enable = true;. +

+
+
+
+
+ Packages. +
+
+ Pick from + 80000+ prebuilt packages for + Linux/macOS and + X64/Arm64. Works with + WSL2. +
+
+
+
+ Run script(s) when entering the environment. +
+
+ Prepare your environment when entering the shell + that has environment already loaded. +
+
+
+
+ Automatically load the environment when entering + the project. +
+
+ Using + direnv will + automatically load the environment when you + enter the project directory. +
+
+
-
-
{ pkgs, config, ... }: {
+
+
+
+
+
+
+
+
+ devenv.nix +
+
+
+ 
{ pkgs, config, ... }: {
   env.GREET = "determinism";
 
   packages = [
@@ -124,37 +188,49 @@ 
Fast, Decla
   '';
 }
-
-
+
+
-
-
devenv shell
+                    

+                        
devenv shell
 hello determinism
 ncdu 2.3
 
 

-          

+
+
+
-
-
-
-
-
-
-
-
-
-
-
- devenv.nix -
-
-
-
{ pkgs, ... }: {
+    

+        

+            

+                

+                    

+                        

+                            

+                                

+                                    

+                                        devenv.nix
+                                    

+                                

+                            

+                            
{ pkgs, ... }: {
   packages = [ pkgs.yarn ];
 
   scripts.build.exec = "yarn build";
@@ -176,11 +252,15 @@ 
Fast, Decla
   };
 }
 

-            

-          

+                        

+                    

 
-          

-
devenv shell
+                    

+                        
devenv shell
 ...
 Running tasks     devenv:enterShell
 Succeeded         devenv:pre-commit:install 15ms
@@ -190,68 +270,114 @@ 
Fast, Decla
 $
 
 

-          

-        

-      

-
-      

-        

-          
Scripts and Tasks

-          

-            Define scripts,  tasks and
-            git hooks
-            to automate your development workflow.
-          

-            

-              

-                Scripts.
-              

-              

-                Define scripts that can be invoked inside the environment, using all the packages and environment
-                variables.
-              

-            

-            

-              

-                Tasks.
-              

-              

-                Form dependencies between automation code, executed in parallel and written in your favorite language.
-              

+                    

+                

             

-            

-              

-                Git hooks.
-              

-              

-                Pick from builtin and language specific linters and formatters using git-hooks.nix.
+
+            

+                

+                    

+                        Scripts and Tasks
+                    

+                    

+                        Define
+                        scripts,
+                        tasks
+                        and
+                        git hooks
+                        to automate your development workflow.
+                    

+
+                    

+                        

+                            

+                                Scripts.
+                            

+                            

+                                Define scripts that can be invoked inside the
+                                environment, using all the packages and
+                                environment variables.
+                            

+                        

+                        

+                            

+                                Tasks.
+                            

+                            

+                                Form dependencies between automation code,
+                                executed in parallel and written in your
+                                favorite language.
+                            

+                        

+                        

+                            

+                                Git hooks.
+                            

+                            

+                                Pick from builtin and language specific linters
+                                and formatters using
+                                git-hooks.nix.
+                            

+                        

+                    

+                

             

-          
         

-
-
-
-
-
-
-

Search packages and options

-

- Explore packages and options to customize your - environment. -

-
+
+
+
+
+

+ Search packages and options +

+

+ Explore + packages + and + options + to customize your environment. +

+
+
-
-
-
-
devenv search devenv
+            

+                

+                    

+                        
devenv search devenv
 +--------------+---------------+------------------------------------------------------------------------+
 | Package      | Version       | Description                                                            |
 +--------------+---------------+------------------------------------------------------------------------+
@@ -268,60 +394,91 @@ 
Fast, Decla
 +--------------------------+---------+-----------+------------------------------------------------------------+
 • Found 1 package and 3 options for 'devenv'.
 

-          

+                    

+                

+
-
-
-
-
-
-
-

Languages

-

- Supports over 50 programming languages. -

-
-
- Packed with tooling. -
-
- Comes with commonly used tooling for each language. Including LSP servers, formatters, linters, and - compilers. -
-
-
-
- Version support. -
-
- Languages like Python, Terraform, Rust, PHP and Ruby all have version support. -
-
-
- Examples -
-
- Checkout examples collection - to get started. -
-
-
-
-
-
-
-
-
-
-
- devenv.nix
+
+
+
+
+

+ Languages +

+

+ Supports over 50 + programming languages. +

+ +
+
+
+ Packed with tooling. +
+
+ Comes with commonly used tooling for each + language. Including LSP servers, formatters, + linters, and compilers. +
+
+
+
+ Version support. +
+
+ Languages like Python, Terraform, Rust, PHP and + Ruby all have version support. +
+
+
+
+ Examples +
+
+ Checkout + examples collection + to get started. +
+
+
-
-
{ pkgs, config, ... }: {
+
+
+
+
+
+
+
+
+ devenv.nix +
+
+
+ 
{ pkgs, config, ... }: {
   languages.python = {
     enable = true;
     version = "3.11";
@@ -354,140 +511,208 @@ 
Fast, Decla
   };
 }
+
+
+
-
-
-
-
-
- -
-
-
-
-
-
-
- devenv.nix
-
-
-
{ pkgs, ... }: {
-  packages = [
-    pkgs.mkdocs
-    pkgs.watchexec
-  ];
+    

+        

+            

+                

+                    

+                        

+                            

+                                

+                                    

+                                        devenv.nix
+                                    

+                                

+                            

+                            
{ pkgs, ... }: {
+    packages = [
+        pkgs.cargo-watch
+    ];
 
-  processes = {
-    docs.exec = "mkdocs serve";
-    tailwind.exec = "watchexec -e html,css,js npx tailwindcss build extra.css -o output.css";
-  };
+    processes = {
+        cargo-watch.exec = "cargo watch -x run";
+    };
 }
 

-            

-          

+                        

+                    

 
-          

-
devenv up
+                    

+                        
devenv up
 • Building processes ...
 • Starting processes ...
 ...
 
 

-          

-        

-      

-
-      

-        

-          
Run processes

-          

-            Define your processes in a declarative way
-            and start them with devenv up.
-          

-            

-              

-                Processes
-              

-              

-                Inspired by Procfile, declare development processes that have
-                access to your environment.
-              

+                    

+                

             

-            

-              

-                process-compose
-              

-              

-                By default process-compose is used to manage processes,
-                giving you a
-                simple interface to inspect logs and restart processes (ctrl-r).
-                
+
+            

+                

+                    

+                        Run processes
+                    

+                    

+                        Define your
+                        processes in a declarative way
+                        and start them with
+                        devenv up.
+                    

+
+                    

+                        

+                            

+                                Processes
+                            

+                            

+                                Inspired by
+                                Procfile,
+                                declare development processes that have access
+                                to your environment.
+                            

+                        

+                        

+                            

+                                process-compose
+                            

+                            

+                                By default
+                                process-compose
+                                is used to manage processes, giving you a simple
+                                interface to inspect logs and restart processes
+                                (ctrl-r).
+                                
+                            

+                        

+                    

+                

             

-          
         

-
-
-
-
-
-
-

Run services

-

- Pick from a number of community maintained - services like PostgreSQL, Redis, MySQL, - RabbitMQ, WireMock, MinIO, Caddy, ElasticSearch, OpenTelemetry Collector, and more are being added each day. -

-
-
- Pre-configured processes -
-
- Services define processes that are started when the service is enabled as part of devenv up. -
-
-
-
- Configuration -
-
- Each service provides a number of options how to configure it and a hook to pass extra configuration, - whatever the format. -
-
-
- Extendable -
-
- Define your development processes as a service, allowing reuse and simplicity of a few lines of - configuration. -
-
-
-
-
-
-
-
-
-
-
-
- devenv.nix
+
+
+
+
+

+ Run services +

+

+ Pick from a number of community maintained + services + like + PostgreSQL, Redis, MySQL, RabbitMQ, WireMock, + MinIO, Caddy, ElasticSearch, OpenTelemetry + Collector, and + more are being added + each day. +

+ +
+
+
+ Pre-configured processes +
+
+ Services define processes that are started when + the service is enabled as part of + devenv up. +
+
+
+
+ Configuration +
+
+ Each service provides a number of options how to + configure it and a hook to pass extra + configuration, whatever the format. +
+
+
+
+ Extendable +
+
+ Define your development processes as a service, + allowing reuse and simplicity of a few lines of + configuration. +
+
+
-
-
{ pkgs, ... }: {
+
+
+
+
+
+
+
+
+ devenv.nix +
+
+
+ 
{ pkgs, ... }: {
   services.postgres = {
     enable = true;
     package = pkgs.postgresql_15;
@@ -501,35 +726,48 @@ 
Fast, Decla
   };
 }
-
-
+
+
-
-
devenv up
+                    

+                        
devenv up
 ...
 
 

-          

+
+
+
-
-
-
-
-
-
-
-
-
-
-
- devenv.nix
-
-
-
{ pkgs, ... }: {
+    

+        

+            

+                

+                    

+                        

+                            

+                                

+                                    

+                                        devenv.nix
+                                    

+                                

+                            

+                            
{ pkgs, ... }: {
   packages = [
     pkgs.mkdocs
     pkgs.curl
@@ -546,98 +784,162 @@ 
Fast, Decla
 }
 
 

-            

-          

+                        

+                    

 
-          

-
devenv test
+                    

+                        
devenv test
 ...
 
 

-          

-        

-      

-
-      

-        

-          
Run tests

-          

-            Running a script inside your development environment
-              with all processes running should be as simple as devenv test.
-          

-            

-              

-                enterTest
-              

-              

-                Execute your favorite language test runner or a simple script to verify your environment.
-
-                
All process management is taken care for you.

-              

+                    

+                

+            

+
+            

+                

+                    

+                        Run tests
+                    

+                    

+                        Running
+                        a script inside your development environment with
+                            all processes running
+                        should be as simple as
+                        devenv test.
+                    

+
+                    

+                        

+                            

+                                enterTest
+                            

+                            

+                                Execute your favorite language test runner or a
+                                simple script to verify your environment.
+
+                                

+                                    All process management is taken care for
+                                    you.
+                                

+                            

+                        

+                    

+                

             

-          
         

-
-
-
-
-
-
-

Container interoperability

-

- Generate containers from your development - environment and build/copy/run them. -

-
-
- Containerize your environment. -
-
- shell container allows you to run your environment in a container. - -

Use devenv container run shell to enter your - environment in a container.

-
-
-
-
- Containerize your processes. -
-
- processes container allows you to run your processes in a - container. - -

Use devenv container run processes to run your - processes in a container.

-
-
-
- Custom containers. -
-
- Define containers.mycontainer.* to customize your container. -
-
+
+
+
+
+

+ Container interoperability +

+

+ Generate containers + from your development environment and build/copy/run + them. +

-
-
-
-
-
-
-
-
-
-
- devenv.nix
+
+
+
+ Containerize your environment. +
+
+ shell + container allows you to run your environment in + a container. + +

+ Use + devenv container run shell + to enter your environment in a container. +

+
+
+
+
+ Containerize your processes. +
+
+ processes + container allows you to run your processes in a + container. + +

+ Use + devenv container run processes + to run your processes in a container. +

+
+
+
+
+ Custom containers. +
+
+ Define + containers.mycontainer.* + to + customize your container. +
+
+
-
-
{ pkgs, ... }: {
+
+
+
+
+
+
+
+
+ devenv.nix +
+
+
+ 
{ pkgs, ... }: {
   packages = [
     pkgs.mkdocs
     pkgs.curl
@@ -649,11 +951,15 @@ 
Fast, Decla
 }
-
-
+
+
-
-
devenv container build processes
+                    

+                        
devenv container build processes
 ...
 devenv container copy processes
 ...
@@ -661,27 +967,36 @@ 
Fast, Decla
 ...
 
 

-          

+
+
+
-
-
-
-
-
-
-
-
-
-
-
- devenv.yaml
-
-
-
inputs:
+    

+        

+            

+                

+                    

+                        

+                            

+                                

+                                    

+                                        devenv.yaml
+                                    

+                                

+                            

+                            
inputs:
   myorg-devenv:
     url: github:myorg/myorg-devenv
 imports:
@@ -690,53 +1005,75 @@ 
Fast, Decla
   - myorg-devenv/service1
   - myorg-devenv/service2
 

+                        

+                    

+                

             

-          

-        

-
- -
-
-

Poly/Mono repo composability

-

- Compose multiple environments - into a single environment. -

-
-
- Local imports -
-
- If you're working on a monorepo, define environment per folder and import them to merge them into a - single environment. -
-
-
-
- Remote imports -
-
- If you're working on a polyrepo, define environment per repository and import them to merge them into a - single environment. - -

A great way to get started is to use central repository with all the shared - configuration until your team is comfortable - maintaining their own environments.

+ +
+
+

+ Poly/Mono repo composability +

+

+ Compose multiple environments + into a single environment. +

+ +
+
+
+ Local imports +
+
+ If you're working on a monorepo, define + environment per folder and import them to merge + them into a single environment. +
+
+
+
+ Remote imports +
+
+ If you're working on a polyrepo, define + environment per repository and import them to + merge them into a single environment. + +

+ A great way to get started is to use central + repository with all the shared configuration + until your team is comfortable maintaining + their own environments. +

+
+
+
+
-
-
-
-

Built by

- +

Built by

+
- + {% endblock %} @@ -744,6 +1081,4 @@

Built by

{% block content %}{% endblock %} -{% block footer %} -{{ super() }} -{% endblock %} +{% block footer %} {{ super() }} {% endblock %} From 5c478e6711c61a476b4c7d2b13bfa1c72acfcb71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Thu, 17 Oct 2024 11:34:40 +0100 Subject: [PATCH 10/28] bump devenv.lock --- devenv.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/devenv.lock b/devenv.lock index 2ee7da7cc..9d0732b44 100644 --- a/devenv.lock +++ b/devenv.lock @@ -86,10 +86,10 @@ "libgit2": { "flake": false, "locked": { - "lastModified": 1728645207, + "lastModified": 1729159177, "owner": "libgit2", "repo": "libgit2", - "rev": "a9aa21476e34679fb7e381d04356c7a94bc698fe", + "rev": "215aafbd6d424dcb3401ad9903b203208a9ed923", "type": "github" }, "original": { @@ -124,10 +124,10 @@ }, "nixpkgs": { "locked": { - "lastModified": 1729101357, + "lastModified": 1729153142, "owner": "NixOS", "repo": "nixpkgs", - "rev": "945fecb357f60fa2264165b86453b1084db9740d", + "rev": "bc8d6370f78e3d9888d2bc077d043cded27abe7a", "type": "github" }, "original": { From ab6d7d34451659a9614e96c328babbe810d85e77 Mon Sep 17 00:00:00 2001 From: Sander Date: Tue, 19 Nov 2024 03:56:55 +0400 Subject: [PATCH 11/28] dev: bump devenv.lock --- devenv.lock | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/devenv.lock b/devenv.lock index 572e1f03d..83739cb05 100644 --- a/devenv.lock +++ b/devenv.lock @@ -51,10 +51,10 @@ ] }, "locked": { - "lastModified": 1727826117, + "lastModified": 1730504689, "owner": "hercules-ci", "repo": "flake-parts", - "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1", + "rev": "506278e768c2a08bec68eb62932193e341f55c90", "type": "github" }, "original": { @@ -86,10 +86,10 @@ "libgit2": { "flake": false, "locked": { - "lastModified": 1729159177, + "lastModified": 1730231647, "owner": "libgit2", "repo": "libgit2", - "rev": "215aafbd6d424dcb3401ad9903b203208a9ed923", + "rev": "c6111ec06cc0b0126cd67bdab78f8091e4cfaa10", "type": "github" }, "original": { @@ -124,10 +124,10 @@ }, "nixpkgs": { "locked": { - "lastModified": 1729153142, + "lastModified": 1731954261, "owner": "NixOS", "repo": "nixpkgs", - "rev": "bc8d6370f78e3d9888d2bc077d043cded27abe7a", + "rev": "ad2c28c6c5cc04e09bed68db46db5718d40b5b9e", "type": "github" }, "original": { @@ -215,10 +215,10 @@ ] }, "locked": { - "lastModified": 1729104314, + "lastModified": 1731363552, "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "3c3e88f0f544d6bb54329832616af7eb971b6be6", + "rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0", "type": "github" }, "original": { From 5b40733123367ddb2f47eb8bc76dbf3c1608fdbd Mon Sep 17 00:00:00 2001 From: Sander Date: Tue, 19 Nov 2024 04:17:47 +0400 Subject: [PATCH 12/28] docs: bump tailwind css --- docs/assets/output.css | 1037 +--------------------------------------- 1 file changed, 1 insertion(+), 1036 deletions(-) diff --git a/docs/assets/output.css b/docs/assets/output.css index 1da7c9765..67cd62520 100644 --- a/docs/assets/output.css +++ b/docs/assets/output.css @@ -1,1036 +1 @@ -/* -! tailwindcss v3.4.3 | MIT License | https://tailwindcss.com -*/ - -/* -1. Prevent padding and border from affecting element width. (https://github.com/mozdevs/cssremedy/issues/4) -2. Allow adding a border to an element by just adding a border-width. (https://github.com/tailwindcss/tailwindcss/pull/116) -*/ - -*, -::before, -::after { - box-sizing: border-box; - /* 1 */ - border-width: 0; - /* 2 */ - border-style: solid; - /* 2 */ - border-color: #e5e7eb; - /* 2 */ -} - -::before, -::after { - --tw-content: ''; -} - -/* -1. Use a consistent sensible line-height in all browsers. -2. Prevent adjustments of font size after orientation changes in iOS. -3. Use a more readable tab size. -4. Use the user's configured `sans` font-family by default. -5. Use the user's configured `sans` font-feature-settings by default. -6. Use the user's configured `sans` font-variation-settings by default. -7. Disable tap highlights on iOS -*/ - -html, -:host { - line-height: 1.5; - /* 1 */ - -webkit-text-size-adjust: 100%; - /* 2 */ - -moz-tab-size: 4; - /* 3 */ - -o-tab-size: 4; - tab-size: 4; - /* 3 */ - font-family: ui-sans-serif, system-ui, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"; - /* 4 */ - font-feature-settings: normal; - /* 5 */ - font-variation-settings: normal; - /* 6 */ - -webkit-tap-highlight-color: transparent; - /* 7 */ -} - -/* -1. Remove the margin in all browsers. -2. Inherit line-height from `html` so users can set them as a class directly on the `html` element. -*/ - -body { - margin: 0; - /* 1 */ - line-height: inherit; - /* 2 */ -} - -/* -1. Add the correct height in Firefox. -2. Correct the inheritance of border color in Firefox. (https://bugzilla.mozilla.org/show_bug.cgi?id=190655) -3. Ensure horizontal rules are visible by default. -*/ - -hr { - height: 0; - /* 1 */ - color: inherit; - /* 2 */ - border-top-width: 1px; - /* 3 */ -} - -/* -Add the correct text decoration in Chrome, Edge, and Safari. -*/ - -abbr:where([title]) { - -webkit-text-decoration: underline dotted; - text-decoration: underline dotted; -} - -/* -Remove the default font size and weight for headings. -*/ - -h1, -h2, -h3, -h4, -h5, -h6 { - font-size: inherit; - font-weight: inherit; -} - -/* -Reset links to optimize for opt-in styling instead of opt-out. -*/ - -a { - color: inherit; - text-decoration: inherit; -} - -/* -Add the correct font weight in Edge and Safari. -*/ - -b, -strong { - font-weight: bolder; -} - -/* -1. Use the user's configured `mono` font-family by default. -2. Use the user's configured `mono` font-feature-settings by default. -3. Use the user's configured `mono` font-variation-settings by default. -4. Correct the odd `em` font sizing in all browsers. -*/ - -code, -kbd, -samp, -pre { - font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace; - /* 1 */ - font-feature-settings: normal; - /* 2 */ - font-variation-settings: normal; - /* 3 */ - font-size: 1em; - /* 4 */ -} - -/* -Add the correct font size in all browsers. -*/ - -small { - font-size: 80%; -} - -/* -Prevent `sub` and `sup` elements from affecting the line height in all browsers. -*/ - -sub, -sup { - font-size: 75%; - line-height: 0; - position: relative; - vertical-align: baseline; -} - -sub { - bottom: -0.25em; -} - -sup { - top: -0.5em; -} - -/* -1. Remove text indentation from table contents in Chrome and Safari. (https://bugs.chromium.org/p/chromium/issues/detail?id=999088, https://bugs.webkit.org/show_bug.cgi?id=201297) -2. Correct table border color inheritance in all Chrome and Safari. (https://bugs.chromium.org/p/chromium/issues/detail?id=935729, https://bugs.webkit.org/show_bug.cgi?id=195016) -3. Remove gaps between table borders by default. -*/ - -table { - text-indent: 0; - /* 1 */ - border-color: inherit; - /* 2 */ - border-collapse: collapse; - /* 3 */ -} - -/* -1. Change the font styles in all browsers. -2. Remove the margin in Firefox and Safari. -3. Remove default padding in all browsers. -*/ - -button, -input, -optgroup, -select, -textarea { - font-family: inherit; - /* 1 */ - font-feature-settings: inherit; - /* 1 */ - font-variation-settings: inherit; - /* 1 */ - font-size: 100%; - /* 1 */ - font-weight: inherit; - /* 1 */ - line-height: inherit; - /* 1 */ - letter-spacing: inherit; - /* 1 */ - color: inherit; - /* 1 */ - margin: 0; - /* 2 */ - padding: 0; - /* 3 */ -} - -/* -Remove the inheritance of text transform in Edge and Firefox. -*/ - -button, -select { - text-transform: none; -} - -/* -1. Correct the inability to style clickable types in iOS and Safari. -2. Remove default button styles. -*/ - -button, -input:where([type='button']), -input:where([type='reset']), -input:where([type='submit']) { - -webkit-appearance: button; - /* 1 */ - background-color: transparent; - /* 2 */ - background-image: none; - /* 2 */ -} - -/* -Use the modern Firefox focus style for all focusable elements. -*/ - -:-moz-focusring { - outline: auto; -} - -/* -Remove the additional `:invalid` styles in Firefox. (https://github.com/mozilla/gecko-dev/blob/2f9eacd9d3d995c937b4251a5557d95d494c9be1/layout/style/res/forms.css#L728-L737) -*/ - -:-moz-ui-invalid { - box-shadow: none; -} - -/* -Add the correct vertical alignment in Chrome and Firefox. -*/ - -progress { - vertical-align: baseline; -} - -/* -Correct the cursor style of increment and decrement buttons in Safari. -*/ - -::-webkit-inner-spin-button, -::-webkit-outer-spin-button { - height: auto; -} - -/* -1. Correct the odd appearance in Chrome and Safari. -2. Correct the outline style in Safari. -*/ - -[type='search'] { - -webkit-appearance: textfield; - /* 1 */ - outline-offset: -2px; - /* 2 */ -} - -/* -Remove the inner padding in Chrome and Safari on macOS. -*/ - -::-webkit-search-decoration { - -webkit-appearance: none; -} - -/* -1. Correct the inability to style clickable types in iOS and Safari. -2. Change font properties to `inherit` in Safari. -*/ - -::-webkit-file-upload-button { - -webkit-appearance: button; - /* 1 */ - font: inherit; - /* 2 */ -} - -/* -Add the correct display in Chrome and Safari. -*/ - -summary { - display: list-item; -} - -/* -Removes the default spacing and border for appropriate elements. -*/ - -blockquote, -dl, -dd, -h1, -h2, -h3, -h4, -h5, -h6, -hr, -figure, -p, -pre { - margin: 0; -} - -fieldset { - margin: 0; - padding: 0; -} - -legend { - padding: 0; -} - -ol, -ul, -menu { - list-style: none; - margin: 0; - padding: 0; -} - -/* -Reset default styling for dialogs. -*/ - -dialog { - padding: 0; -} - -/* -Prevent resizing textareas horizontally by default. -*/ - -textarea { - resize: vertical; -} - -/* -1. Reset the default placeholder opacity in Firefox. (https://github.com/tailwindlabs/tailwindcss/issues/3300) -2. Set the default placeholder color to the user's configured gray 400 color. -*/ - -input::-moz-placeholder, textarea::-moz-placeholder { - opacity: 1; - /* 1 */ - color: #9ca3af; - /* 2 */ -} - -input::placeholder, -textarea::placeholder { - opacity: 1; - /* 1 */ - color: #9ca3af; - /* 2 */ -} - -/* -Set the default cursor for buttons. -*/ - -button, -[role="button"] { - cursor: pointer; -} - -/* -Make sure disabled buttons don't get the pointer cursor. -*/ - -:disabled { - cursor: default; -} - -/* -1. Make replaced elements `display: block` by default. (https://github.com/mozdevs/cssremedy/issues/14) -2. Add `vertical-align: middle` to align replaced elements more sensibly by default. (https://github.com/jensimmons/cssremedy/issues/14#issuecomment-634934210) - This can trigger a poorly considered lint error in some tools but is included by design. -*/ - -img, -svg, -video, -canvas, -audio, -iframe, -embed, -object { - display: block; - /* 1 */ - vertical-align: middle; - /* 2 */ -} - -/* -Constrain images and videos to the parent width and preserve their intrinsic aspect ratio. (https://github.com/mozdevs/cssremedy/issues/14) -*/ - -img, -video { - max-width: 100%; - height: auto; -} - -/* Make elements with the HTML hidden attribute stay hidden by default */ - -[hidden] { - display: none; -} - -html { - font-size: 20px; -} - -*, ::before, ::after { - --tw-border-spacing-x: 0; - --tw-border-spacing-y: 0; - --tw-translate-x: 0; - --tw-translate-y: 0; - --tw-rotate: 0; - --tw-skew-x: 0; - --tw-skew-y: 0; - --tw-scale-x: 1; - --tw-scale-y: 1; - --tw-pan-x: ; - --tw-pan-y: ; - --tw-pinch-zoom: ; - --tw-scroll-snap-strictness: proximity; - --tw-gradient-from-position: ; - --tw-gradient-via-position: ; - --tw-gradient-to-position: ; - --tw-ordinal: ; - --tw-slashed-zero: ; - --tw-numeric-figure: ; - --tw-numeric-spacing: ; - --tw-numeric-fraction: ; - --tw-ring-inset: ; - --tw-ring-offset-width: 0px; - --tw-ring-offset-color: #fff; - --tw-ring-color: rgb(59 130 246 / 0.5); - --tw-ring-offset-shadow: 0 0 #0000; - --tw-ring-shadow: 0 0 #0000; - --tw-shadow: 0 0 #0000; - --tw-shadow-colored: 0 0 #0000; - --tw-blur: ; - --tw-brightness: ; - --tw-contrast: ; - --tw-grayscale: ; - --tw-hue-rotate: ; - --tw-invert: ; - --tw-saturate: ; - --tw-sepia: ; - --tw-drop-shadow: ; - --tw-backdrop-blur: ; - --tw-backdrop-brightness: ; - --tw-backdrop-contrast: ; - --tw-backdrop-grayscale: ; - --tw-backdrop-hue-rotate: ; - --tw-backdrop-invert: ; - --tw-backdrop-opacity: ; - --tw-backdrop-saturate: ; - --tw-backdrop-sepia: ; - --tw-contain-size: ; - --tw-contain-layout: ; - --tw-contain-paint: ; - --tw-contain-style: ; -} - -::backdrop { - --tw-border-spacing-x: 0; - --tw-border-spacing-y: 0; - --tw-translate-x: 0; - --tw-translate-y: 0; - --tw-rotate: 0; - --tw-skew-x: 0; - --tw-skew-y: 0; - --tw-scale-x: 1; - --tw-scale-y: 1; - --tw-pan-x: ; - --tw-pan-y: ; - --tw-pinch-zoom: ; - --tw-scroll-snap-strictness: proximity; - --tw-gradient-from-position: ; - --tw-gradient-via-position: ; - --tw-gradient-to-position: ; - --tw-ordinal: ; - --tw-slashed-zero: ; - --tw-numeric-figure: ; - --tw-numeric-spacing: ; - --tw-numeric-fraction: ; - --tw-ring-inset: ; - --tw-ring-offset-width: 0px; - --tw-ring-offset-color: #fff; - --tw-ring-color: rgb(59 130 246 / 0.5); - --tw-ring-offset-shadow: 0 0 #0000; - --tw-ring-shadow: 0 0 #0000; - --tw-shadow: 0 0 #0000; - --tw-shadow-colored: 0 0 #0000; - --tw-blur: ; - --tw-brightness: ; - --tw-contrast: ; - --tw-grayscale: ; - --tw-hue-rotate: ; - --tw-invert: ; - --tw-saturate: ; - --tw-sepia: ; - --tw-drop-shadow: ; - --tw-backdrop-blur: ; - --tw-backdrop-brightness: ; - --tw-backdrop-contrast: ; - --tw-backdrop-grayscale: ; - --tw-backdrop-hue-rotate: ; - --tw-backdrop-invert: ; - --tw-backdrop-opacity: ; - --tw-backdrop-saturate: ; - --tw-backdrop-sepia: ; - --tw-contain-size: ; - --tw-contain-layout: ; - --tw-contain-paint: ; - --tw-contain-style: ; -} - -.container { - width: 100%; -} - -@media (min-width: 640px) { - .container { - max-width: 640px; - } -} - -@media (min-width: 768px) { - .container { - max-width: 768px; - } -} - -@media (min-width: 1024px) { - .container { - max-width: 1024px; - } -} - -@media (min-width: 1280px) { - .container { - max-width: 1280px; - } -} - -@media (min-width: 1536px) { - .container { - max-width: 1536px; - } -} - -.language-shell::before { - content: attr(data-shell-prefix); - margin-inline-end: 0.4rem; - --tw-text-opacity: 1; - color: rgb(147 197 253 / var(--tw-text-opacity)); -} - -.static { - position: static; -} - -.relative { - position: relative; -} - -.isolate { - isolation: isolate; -} - -.mx-auto { - margin-left: auto; - margin-right: auto; -} - -.mb-6 { - margin-bottom: 1.2rem; -} - -.mt-10 { - margin-top: 2rem; -} - -.mt-2 { - margin-top: 0.4rem; -} - -.mt-4 { - margin-top: 0.8rem; -} - -.mt-6 { - margin-top: 1.2rem; -} - -.block { - display: block; -} - -.inline { - display: inline; -} - -.flex { - display: flex; -} - -.grid { - display: grid; -} - -.h-8 { - height: 1.6rem; -} - -.max-w-2xl { - max-width: 33.6rem; -} - -.max-w-3xl { - max-width: 38.4rem; -} - -.max-w-7xl { - max-width: 64rem; -} - -.max-w-xl { - max-width: 28.8rem; -} - -.grid-cols-1 { - grid-template-columns: repeat(1, minmax(0, 1fr)); -} - -.items-center { - align-items: center; -} - -.justify-center { - justify-content: center; -} - -.gap-x-6 { - -moz-column-gap: 1.2rem; - column-gap: 1.2rem; -} - -.gap-x-8 { - -moz-column-gap: 1.6rem; - column-gap: 1.6rem; -} - -.gap-y-16 { - row-gap: 3.2rem; -} - -.space-y-8 > :not([hidden]) ~ :not([hidden]) { - --tw-space-y-reverse: 0; - margin-top: calc(1.6rem * calc(1 - var(--tw-space-y-reverse))); - margin-bottom: calc(1.6rem * var(--tw-space-y-reverse)); -} - -.overflow-hidden { - overflow: hidden; -} - -.truncate { - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; -} - -.rounded-md { - border-radius: 0.3rem; -} - -.rounded-b-xl { - border-bottom-right-radius: 0.6rem; - border-bottom-left-radius: 0.6rem; -} - -.border-b { - border-bottom-width: 1px; -} - -.border-r { - border-right-width: 1px; -} - -.border-t { - border-top-width: 1px; -} - -.border-b-white\/20 { - border-bottom-color: rgb(255 255 255 / 0.2); -} - -.border-r-white\/10 { - border-right-color: rgb(255 255 255 / 0.1); -} - -.border-t-white\/20 { - border-top-color: rgb(255 255 255 / 0.2); -} - -.bg-black { - --tw-bg-opacity: 1; - background-color: rgb(0 0 0 / var(--tw-bg-opacity)); -} - -.bg-gray-100 { - --tw-bg-opacity: 1; - background-color: rgb(243 244 246 / var(--tw-bg-opacity)); -} - -.bg-gray-800\/40 { - background-color: rgb(31 41 55 / 0.4); -} - -.bg-gray-900 { - --tw-bg-opacity: 1; - background-color: rgb(17 24 39 / var(--tw-bg-opacity)); -} - -.bg-white { - --tw-bg-opacity: 1; - background-color: rgb(255 255 255 / var(--tw-bg-opacity)); -} - -.bg-white\/5 { - background-color: rgb(255 255 255 / 0.05); -} - -.p-1 { - padding: 0.2rem; -} - -.px-2 { - padding-left: 0.4rem; - padding-right: 0.4rem; -} - -.px-3 { - padding-left: 0.6rem; - padding-right: 0.6rem; -} - -.px-3\.5 { - padding-left: 0.7rem; - padding-right: 0.7rem; -} - -.px-4 { - padding-left: 0.8rem; - padding-right: 0.8rem; -} - -.py-14 { - padding-top: 2.8rem; - padding-bottom: 2.8rem; -} - -.py-2 { - padding-top: 0.4rem; - padding-bottom: 0.4rem; -} - -.py-2\.5 { - padding-top: 0.5rem; - padding-bottom: 0.5rem; -} - -.py-8 { - padding-top: 1.6rem; - padding-bottom: 1.6rem; -} - -.pt-14 { - padding-top: 2.8rem; -} - -.text-center { - text-align: center; -} - -.text-2xl { - font-size: 1.2rem; - line-height: 1.6rem; -} - -.text-3xl { - font-size: 1.5rem; - line-height: 1.8rem; -} - -.text-base { - font-size: 0.8rem; - line-height: 1.2rem; -} - -.text-lg { - font-size: 0.9rem; - line-height: 1.4rem; -} - -.text-sm { - font-size: 0.7rem; - line-height: 1rem; -} - -.text-xl { - font-size: 1rem; - line-height: 1.4rem; -} - -.font-bold { - font-weight: 700; -} - -.font-medium { - font-weight: 500; -} - -.font-semibold { - font-weight: 600; -} - -.leading-6 { - line-height: 1.2rem; -} - -.leading-7 { - line-height: 1.4rem; -} - -.leading-8 { - line-height: 1.6rem; -} - -.tracking-tight { - letter-spacing: -0.025em; -} - -.text-\[\#425C82\] { - --tw-text-opacity: 1; - color: rgb(66 92 130 / var(--tw-text-opacity)); -} - -.text-black { - --tw-text-opacity: 1; - color: rgb(0 0 0 / var(--tw-text-opacity)); -} - -.text-gray-200 { - --tw-text-opacity: 1; - color: rgb(229 231 235 / var(--tw-text-opacity)); -} - -.text-gray-600 { - --tw-text-opacity: 1; - color: rgb(75 85 99 / var(--tw-text-opacity)); -} - -.text-gray-800 { - --tw-text-opacity: 1; - color: rgb(31 41 55 / var(--tw-text-opacity)); -} - -.text-gray-900 { - --tw-text-opacity: 1; - color: rgb(17 24 39 / var(--tw-text-opacity)); -} - -.text-white { - --tw-text-opacity: 1; - color: rgb(255 255 255 / var(--tw-text-opacity)); -} - -.shadow-sm { - --tw-shadow: 0 1px 2px 0 rgb(0 0 0 / 0.05); - --tw-shadow-colored: 0 1px 2px 0 var(--tw-shadow-color); - box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow); -} - -.filter { - filter: var(--tw-blur) var(--tw-brightness) var(--tw-contrast) var(--tw-grayscale) var(--tw-hue-rotate) var(--tw-invert) var(--tw-saturate) var(--tw-sepia) var(--tw-drop-shadow); -} - -/* mobile make code snippets scrollable */ - -.image-wrapper { - overflow: auto!important; -} - -/* add some whitespace under hero CTA button */ - -.md-main__inner { - padding-bottom: 1rem; -} - -.hover\:to-\[\#425C82\]:hover { - --tw-gradient-to: #425C82 var(--tw-gradient-to-position); -} - -.focus-visible\:outline:focus-visible { - outline-style: solid; -} - -.focus-visible\:outline-2:focus-visible { - outline-width: 2px; -} - -.focus-visible\:outline-offset-2:focus-visible { - outline-offset: 2px; -} - -.focus-visible\:outline-indigo-400:focus-visible { - outline-color: #818cf8; -} - -@media (min-width: 640px) { - .sm\:mx-0 { - margin-left: 0px; - margin-right: 0px; - } - - .sm\:mx-auto { - margin-left: auto; - margin-right: auto; - } - - .sm\:max-w-2xl { - max-width: 33.6rem; - } - - .sm\:max-w-none { - max-width: none; - } - - .sm\:gap-y-20 { - row-gap: 4rem; - } - - .sm\:text-4xl { - font-size: 1.8rem; - line-height: 2rem; - } -} - -@media (min-width: 768px) { - .md\:px-6 { - padding-left: 1.2rem; - padding-right: 1.2rem; - } -} - -@media (min-width: 1024px) { - .lg\:mx-0 { - margin-left: 0px; - margin-right: 0px; - } - - .lg\:max-w-lg { - max-width: 25.6rem; - } - - .lg\:max-w-none { - max-width: none; - } - - .lg\:grid-cols-2 { - grid-template-columns: repeat(2, minmax(0, 1fr)); - } - - .lg\:items-start { - align-items: flex-start; - } - - .lg\:px-0 { - padding-left: 0px; - padding-right: 0px; - } - - .lg\:px-8 { - padding-left: 1.6rem; - padding-right: 1.6rem; - } - - .lg\:pl-3 { - padding-left: 0.6rem; - } -} +/*! tailwindcss v3.4.3 | MIT License | https://tailwindcss.com*/*,:after,:before{border:0 solid #e5e7eb;box-sizing:border-box}:after,:before{--tw-content:""}:host,html{-webkit-text-size-adjust:100%;font-feature-settings:normal;-webkit-tap-highlight-color:transparent;font-family:ui-sans-serif,system-ui,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol,Noto Color Emoji;font-variation-settings:normal;line-height:1.5;-moz-tab-size:4;-o-tab-size:4;tab-size:4}body{line-height:inherit;margin:0}hr{border-top-width:1px;color:inherit;height:0}abbr:where([title]){-webkit-text-decoration:underline dotted;text-decoration:underline dotted}h1,h2,h3,h4,h5,h6{font-size:inherit;font-weight:inherit}a{color:inherit;text-decoration:inherit}b,strong{font-weight:bolder}code,kbd,pre,samp{font-feature-settings:normal;font-family:ui-monospace,SFMono-Regular,Menlo,Monaco,Consolas,Liberation Mono,Courier New,monospace;font-size:1em;font-variation-settings:normal}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:initial}sub{bottom:-.25em}sup{top:-.5em}table{border-collapse:collapse;border-color:inherit;text-indent:0}button,input,optgroup,select,textarea{font-feature-settings:inherit;color:inherit;font-family:inherit;font-size:100%;font-variation-settings:inherit;font-weight:inherit;letter-spacing:inherit;line-height:inherit;margin:0;padding:0}button,select{text-transform:none}button,input:where([type=button]),input:where([type=reset]),input:where([type=submit]){-webkit-appearance:button;background-color:initial;background-image:none}:-moz-focusring{outline:auto}:-moz-ui-invalid{box-shadow:none}progress{vertical-align:initial}::-webkit-inner-spin-button,::-webkit-outer-spin-button{height:auto}[type=search]{-webkit-appearance:textfield;outline-offset:-2px}::-webkit-search-decoration{-webkit-appearance:none}::-webkit-file-upload-button{-webkit-appearance:button;font:inherit}summary{display:list-item}blockquote,dd,dl,figure,h1,h2,h3,h4,h5,h6,hr,p,pre{margin:0}fieldset{margin:0}fieldset,legend{padding:0}menu,ol,ul{list-style:none;margin:0;padding:0}dialog{padding:0}textarea{resize:vertical}input::-moz-placeholder,textarea::-moz-placeholder{color:#9ca3af;opacity:1}input::placeholder,textarea::placeholder{color:#9ca3af;opacity:1}[role=button],button{cursor:pointer}:disabled{cursor:default}audio,canvas,embed,iframe,img,object,svg,video{display:block;vertical-align:middle}img,video{height:auto;max-width:100%}[hidden]{display:none}html{font-size:20px}*,::backdrop,:after,:before{--tw-border-spacing-x:0;--tw-border-spacing-y:0;--tw-translate-x:0;--tw-translate-y:0;--tw-rotate:0;--tw-skew-x:0;--tw-skew-y:0;--tw-scale-x:1;--tw-scale-y:1;--tw-pan-x: ;--tw-pan-y: ;--tw-pinch-zoom: ;--tw-scroll-snap-strictness:proximity;--tw-gradient-from-position: ;--tw-gradient-via-position: ;--tw-gradient-to-position: ;--tw-ordinal: ;--tw-slashed-zero: ;--tw-numeric-figure: ;--tw-numeric-spacing: ;--tw-numeric-fraction: ;--tw-ring-inset: ;--tw-ring-offset-width:0px;--tw-ring-offset-color:#fff;--tw-ring-color:#3b82f680;--tw-ring-offset-shadow:0 0 #0000;--tw-ring-shadow:0 0 #0000;--tw-shadow:0 0 #0000;--tw-shadow-colored:0 0 #0000;--tw-blur: ;--tw-brightness: ;--tw-contrast: ;--tw-grayscale: ;--tw-hue-rotate: ;--tw-invert: ;--tw-saturate: ;--tw-sepia: ;--tw-drop-shadow: ;--tw-backdrop-blur: ;--tw-backdrop-brightness: ;--tw-backdrop-contrast: ;--tw-backdrop-grayscale: ;--tw-backdrop-hue-rotate: ;--tw-backdrop-invert: ;--tw-backdrop-opacity: ;--tw-backdrop-saturate: ;--tw-backdrop-sepia: ;--tw-contain-size: ;--tw-contain-layout: ;--tw-contain-paint: ;--tw-contain-style: }.container{width:100%}@media (min-width:640px){.container{max-width:640px}}@media (min-width:768px){.container{max-width:768px}}@media (min-width:1024px){.container{max-width:1024px}}@media (min-width:1280px){.container{max-width:1280px}}@media (min-width:1536px){.container{max-width:1536px}}.language-shell:before{--tw-text-opacity:1;color:rgb(147 197 253/var(--tw-text-opacity));content:attr(data-shell-prefix);margin-inline-end:.4rem}.static{position:static}.relative{position:relative}.isolate{isolation:isolate}.mx-auto{margin-left:auto;margin-right:auto}.mb-6{margin-bottom:1.2rem}.mt-10{margin-top:2rem}.mt-2{margin-top:.4rem}.mt-4{margin-top:.8rem}.mt-6{margin-top:1.2rem}.block{display:block}.inline{display:inline}.flex{display:flex}.grid{display:grid}.h-8{height:1.6rem}.max-w-2xl{max-width:33.6rem}.max-w-3xl{max-width:38.4rem}.max-w-7xl{max-width:64rem}.max-w-xl{max-width:28.8rem}.grid-cols-1{grid-template-columns:repeat(1,minmax(0,1fr))}.items-center{align-items:center}.justify-center{justify-content:center}.gap-x-6{-moz-column-gap:1.2rem;column-gap:1.2rem}.gap-x-8{-moz-column-gap:1.6rem;column-gap:1.6rem}.gap-y-16{row-gap:3.2rem}.space-y-8>:not([hidden])~:not([hidden]){--tw-space-y-reverse:0;margin-bottom:calc(1.6rem*var(--tw-space-y-reverse));margin-top:calc(1.6rem*(1 - var(--tw-space-y-reverse)))}.overflow-hidden,.truncate{overflow:hidden}.truncate{text-overflow:ellipsis;white-space:nowrap}.rounded-md{border-radius:.3rem}.rounded-b-xl{border-bottom-left-radius:.6rem;border-bottom-right-radius:.6rem}.border-b{border-bottom-width:1px}.border-r{border-right-width:1px}.border-t{border-top-width:1px}.border-b-white\/20{border-bottom-color:#fff3}.border-r-white\/10{border-right-color:#ffffff1a}.border-t-white\/20{border-top-color:#fff3}.bg-black{--tw-bg-opacity:1;background-color:rgb(0 0 0/var(--tw-bg-opacity))}.bg-gray-100{--tw-bg-opacity:1;background-color:rgb(243 244 246/var(--tw-bg-opacity))}.bg-gray-800\/40{background-color:#1f293766}.bg-gray-900{--tw-bg-opacity:1;background-color:rgb(17 24 39/var(--tw-bg-opacity))}.bg-white{--tw-bg-opacity:1;background-color:rgb(255 255 255/var(--tw-bg-opacity))}.bg-white\/5{background-color:#ffffff0d}.p-1{padding:.2rem}.px-2{padding-left:.4rem;padding-right:.4rem}.px-3{padding-left:.6rem;padding-right:.6rem}.px-3\.5{padding-left:.7rem;padding-right:.7rem}.px-4{padding-left:.8rem;padding-right:.8rem}.py-14{padding-bottom:2.8rem;padding-top:2.8rem}.py-2{padding-bottom:.4rem;padding-top:.4rem}.py-2\.5{padding-bottom:.5rem;padding-top:.5rem}.py-8{padding-bottom:1.6rem;padding-top:1.6rem}.pt-14{padding-top:2.8rem}.text-center{text-align:center}.text-2xl{font-size:1.2rem;line-height:1.6rem}.text-3xl{font-size:1.5rem;line-height:1.8rem}.text-base{font-size:.8rem;line-height:1.2rem}.text-lg{font-size:.9rem;line-height:1.4rem}.text-sm{font-size:.7rem;line-height:1rem}.text-xl{font-size:1rem;line-height:1.4rem}.font-bold{font-weight:700}.font-medium{font-weight:500}.font-semibold{font-weight:600}.leading-6{line-height:1.2rem}.leading-7{line-height:1.4rem}.leading-8{line-height:1.6rem}.tracking-tight{letter-spacing:-.025em}.text-\[\#425C82\]{--tw-text-opacity:1;color:rgb(66 92 130/var(--tw-text-opacity))}.text-black{--tw-text-opacity:1;color:rgb(0 0 0/var(--tw-text-opacity))}.text-gray-200{--tw-text-opacity:1;color:rgb(229 231 235/var(--tw-text-opacity))}.text-gray-600{--tw-text-opacity:1;color:rgb(75 85 99/var(--tw-text-opacity))}.text-gray-800{--tw-text-opacity:1;color:rgb(31 41 55/var(--tw-text-opacity))}.text-gray-900{--tw-text-opacity:1;color:rgb(17 24 39/var(--tw-text-opacity))}.text-white{--tw-text-opacity:1;color:rgb(255 255 255/var(--tw-text-opacity))}.shadow-sm{--tw-shadow:0 1px 2px 0 #0000000d;--tw-shadow-colored:0 1px 2px 0 var(--tw-shadow-color);box-shadow:var(--tw-ring-offset-shadow,0 0 #0000),var(--tw-ring-shadow,0 0 #0000),var(--tw-shadow)}.filter{filter:var(--tw-blur) var(--tw-brightness) var(--tw-contrast) var(--tw-grayscale) var(--tw-hue-rotate) var(--tw-invert) var(--tw-saturate) var(--tw-sepia) var(--tw-drop-shadow)}.image-wrapper{overflow:auto!important}.md-main__inner{padding-bottom:1rem}.hover\:to-\[\#425C82\]:hover{--tw-gradient-to:#425c82 var(--tw-gradient-to-position)}.focus-visible\:outline:focus-visible{outline-style:solid}.focus-visible\:outline-2:focus-visible{outline-width:2px}.focus-visible\:outline-offset-2:focus-visible{outline-offset:2px}.focus-visible\:outline-indigo-400:focus-visible{outline-color:#818cf8}@media (min-width:640px){.sm\:mx-0{margin-left:0;margin-right:0}.sm\:mx-auto{margin-left:auto;margin-right:auto}.sm\:max-w-2xl{max-width:33.6rem}.sm\:max-w-none{max-width:none}.sm\:gap-y-20{row-gap:4rem}.sm\:text-4xl{font-size:1.8rem;line-height:2rem}}@media (min-width:768px){.md\:px-6{padding-left:1.2rem;padding-right:1.2rem}}@media (min-width:1024px){.lg\:mx-0{margin-left:0;margin-right:0}.lg\:max-w-lg{max-width:25.6rem}.lg\:max-w-none{max-width:none}.lg\:grid-cols-2{grid-template-columns:repeat(2,minmax(0,1fr))}.lg\:items-start{align-items:flex-start}.lg\:px-0{padding-left:0;padding-right:0}.lg\:px-8{padding-left:1.6rem;padding-right:1.6rem}.lg\:pl-3{padding-left:.6rem}} \ No newline at end of file From 70a9433add44d5890589a254c777696e84e2ab35 Mon Sep 17 00:00:00 2001 From: Sander Date: Tue, 19 Nov 2024 04:43:52 +0400 Subject: [PATCH 13/28] dev: commit rolling changes --- devenv.lock | 59 ++++++++++++++++++++++-------------------- docs/assets/output.css | 2 +- requirements.txt | 6 +++++ 3 files changed, 38 insertions(+), 29 deletions(-) diff --git a/devenv.lock b/devenv.lock index 83739cb05..96da173ba 100644 --- a/devenv.lock +++ b/devenv.lock @@ -63,10 +63,32 @@ "type": "github" } }, + "git-hooks": { + "inputs": { + "flake-compat": "flake-compat", + "gitignore": "gitignore", + "nixpkgs": [ + "nixpkgs" + ], + "nixpkgs-stable": "nixpkgs-stable" + }, + "locked": { + "lastModified": 1731363552, + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, "gitignore": { "inputs": { "nixpkgs": [ - "pre-commit-hooks", + "git-hooks", "nixpkgs" ] }, @@ -100,7 +122,7 @@ }, "nix": { "inputs": { - "flake-compat": "flake-compat", + "flake-compat": "flake-compat_2", "flake-parts": "flake-parts", "libgit2": "libgit2", "nixpkgs": "nixpkgs", @@ -184,15 +206,15 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1716977621, + "lastModified": 1731890469, "owner": "cachix", "repo": "devenv-nixpkgs", - "rev": "4267e705586473d3e5c8d50299e71503f16a6fb6", + "rev": "5083ec887760adfe12af64830a66807423a859a7", "type": "github" }, "original": { "owner": "cachix", - "ref": "rolling", + "ref": "bump-rolling", "repo": "devenv-nixpkgs", "type": "github" } @@ -227,34 +249,15 @@ "type": "github" } }, - "pre-commit-hooks_2": { - "inputs": { - "flake-compat": "flake-compat_2", - "gitignore": "gitignore", - "nixpkgs": [ - "nixpkgs" - ], - "nixpkgs-stable": "nixpkgs-stable" - }, - "locked": { - "lastModified": 1731363552, - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "type": "github" - } - }, "root": { "inputs": { "devenv": "devenv", + "git-hooks": "git-hooks", "nix": "nix", "nixpkgs": "nixpkgs_2", - "pre-commit-hooks": "pre-commit-hooks_2" + "pre-commit-hooks": [ + "git-hooks" + ] } } }, diff --git a/docs/assets/output.css b/docs/assets/output.css index 67cd62520..4abcea394 100644 --- a/docs/assets/output.css +++ b/docs/assets/output.css @@ -1 +1 @@ -/*! tailwindcss v3.4.3 | MIT License | https://tailwindcss.com*/*,:after,:before{border:0 solid #e5e7eb;box-sizing:border-box}:after,:before{--tw-content:""}:host,html{-webkit-text-size-adjust:100%;font-feature-settings:normal;-webkit-tap-highlight-color:transparent;font-family:ui-sans-serif,system-ui,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol,Noto Color Emoji;font-variation-settings:normal;line-height:1.5;-moz-tab-size:4;-o-tab-size:4;tab-size:4}body{line-height:inherit;margin:0}hr{border-top-width:1px;color:inherit;height:0}abbr:where([title]){-webkit-text-decoration:underline dotted;text-decoration:underline dotted}h1,h2,h3,h4,h5,h6{font-size:inherit;font-weight:inherit}a{color:inherit;text-decoration:inherit}b,strong{font-weight:bolder}code,kbd,pre,samp{font-feature-settings:normal;font-family:ui-monospace,SFMono-Regular,Menlo,Monaco,Consolas,Liberation Mono,Courier New,monospace;font-size:1em;font-variation-settings:normal}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:initial}sub{bottom:-.25em}sup{top:-.5em}table{border-collapse:collapse;border-color:inherit;text-indent:0}button,input,optgroup,select,textarea{font-feature-settings:inherit;color:inherit;font-family:inherit;font-size:100%;font-variation-settings:inherit;font-weight:inherit;letter-spacing:inherit;line-height:inherit;margin:0;padding:0}button,select{text-transform:none}button,input:where([type=button]),input:where([type=reset]),input:where([type=submit]){-webkit-appearance:button;background-color:initial;background-image:none}:-moz-focusring{outline:auto}:-moz-ui-invalid{box-shadow:none}progress{vertical-align:initial}::-webkit-inner-spin-button,::-webkit-outer-spin-button{height:auto}[type=search]{-webkit-appearance:textfield;outline-offset:-2px}::-webkit-search-decoration{-webkit-appearance:none}::-webkit-file-upload-button{-webkit-appearance:button;font:inherit}summary{display:list-item}blockquote,dd,dl,figure,h1,h2,h3,h4,h5,h6,hr,p,pre{margin:0}fieldset{margin:0}fieldset,legend{padding:0}menu,ol,ul{list-style:none;margin:0;padding:0}dialog{padding:0}textarea{resize:vertical}input::-moz-placeholder,textarea::-moz-placeholder{color:#9ca3af;opacity:1}input::placeholder,textarea::placeholder{color:#9ca3af;opacity:1}[role=button],button{cursor:pointer}:disabled{cursor:default}audio,canvas,embed,iframe,img,object,svg,video{display:block;vertical-align:middle}img,video{height:auto;max-width:100%}[hidden]{display:none}html{font-size:20px}*,::backdrop,:after,:before{--tw-border-spacing-x:0;--tw-border-spacing-y:0;--tw-translate-x:0;--tw-translate-y:0;--tw-rotate:0;--tw-skew-x:0;--tw-skew-y:0;--tw-scale-x:1;--tw-scale-y:1;--tw-pan-x: ;--tw-pan-y: ;--tw-pinch-zoom: ;--tw-scroll-snap-strictness:proximity;--tw-gradient-from-position: ;--tw-gradient-via-position: ;--tw-gradient-to-position: ;--tw-ordinal: ;--tw-slashed-zero: ;--tw-numeric-figure: ;--tw-numeric-spacing: ;--tw-numeric-fraction: ;--tw-ring-inset: ;--tw-ring-offset-width:0px;--tw-ring-offset-color:#fff;--tw-ring-color:#3b82f680;--tw-ring-offset-shadow:0 0 #0000;--tw-ring-shadow:0 0 #0000;--tw-shadow:0 0 #0000;--tw-shadow-colored:0 0 #0000;--tw-blur: ;--tw-brightness: ;--tw-contrast: ;--tw-grayscale: ;--tw-hue-rotate: ;--tw-invert: ;--tw-saturate: ;--tw-sepia: ;--tw-drop-shadow: ;--tw-backdrop-blur: ;--tw-backdrop-brightness: ;--tw-backdrop-contrast: ;--tw-backdrop-grayscale: ;--tw-backdrop-hue-rotate: ;--tw-backdrop-invert: ;--tw-backdrop-opacity: ;--tw-backdrop-saturate: ;--tw-backdrop-sepia: ;--tw-contain-size: ;--tw-contain-layout: ;--tw-contain-paint: ;--tw-contain-style: }.container{width:100%}@media (min-width:640px){.container{max-width:640px}}@media (min-width:768px){.container{max-width:768px}}@media (min-width:1024px){.container{max-width:1024px}}@media (min-width:1280px){.container{max-width:1280px}}@media (min-width:1536px){.container{max-width:1536px}}.language-shell:before{--tw-text-opacity:1;color:rgb(147 197 253/var(--tw-text-opacity));content:attr(data-shell-prefix);margin-inline-end:.4rem}.static{position:static}.relative{position:relative}.isolate{isolation:isolate}.mx-auto{margin-left:auto;margin-right:auto}.mb-6{margin-bottom:1.2rem}.mt-10{margin-top:2rem}.mt-2{margin-top:.4rem}.mt-4{margin-top:.8rem}.mt-6{margin-top:1.2rem}.block{display:block}.inline{display:inline}.flex{display:flex}.grid{display:grid}.h-8{height:1.6rem}.max-w-2xl{max-width:33.6rem}.max-w-3xl{max-width:38.4rem}.max-w-7xl{max-width:64rem}.max-w-xl{max-width:28.8rem}.grid-cols-1{grid-template-columns:repeat(1,minmax(0,1fr))}.items-center{align-items:center}.justify-center{justify-content:center}.gap-x-6{-moz-column-gap:1.2rem;column-gap:1.2rem}.gap-x-8{-moz-column-gap:1.6rem;column-gap:1.6rem}.gap-y-16{row-gap:3.2rem}.space-y-8>:not([hidden])~:not([hidden]){--tw-space-y-reverse:0;margin-bottom:calc(1.6rem*var(--tw-space-y-reverse));margin-top:calc(1.6rem*(1 - var(--tw-space-y-reverse)))}.overflow-hidden,.truncate{overflow:hidden}.truncate{text-overflow:ellipsis;white-space:nowrap}.rounded-md{border-radius:.3rem}.rounded-b-xl{border-bottom-left-radius:.6rem;border-bottom-right-radius:.6rem}.border-b{border-bottom-width:1px}.border-r{border-right-width:1px}.border-t{border-top-width:1px}.border-b-white\/20{border-bottom-color:#fff3}.border-r-white\/10{border-right-color:#ffffff1a}.border-t-white\/20{border-top-color:#fff3}.bg-black{--tw-bg-opacity:1;background-color:rgb(0 0 0/var(--tw-bg-opacity))}.bg-gray-100{--tw-bg-opacity:1;background-color:rgb(243 244 246/var(--tw-bg-opacity))}.bg-gray-800\/40{background-color:#1f293766}.bg-gray-900{--tw-bg-opacity:1;background-color:rgb(17 24 39/var(--tw-bg-opacity))}.bg-white{--tw-bg-opacity:1;background-color:rgb(255 255 255/var(--tw-bg-opacity))}.bg-white\/5{background-color:#ffffff0d}.p-1{padding:.2rem}.px-2{padding-left:.4rem;padding-right:.4rem}.px-3{padding-left:.6rem;padding-right:.6rem}.px-3\.5{padding-left:.7rem;padding-right:.7rem}.px-4{padding-left:.8rem;padding-right:.8rem}.py-14{padding-bottom:2.8rem;padding-top:2.8rem}.py-2{padding-bottom:.4rem;padding-top:.4rem}.py-2\.5{padding-bottom:.5rem;padding-top:.5rem}.py-8{padding-bottom:1.6rem;padding-top:1.6rem}.pt-14{padding-top:2.8rem}.text-center{text-align:center}.text-2xl{font-size:1.2rem;line-height:1.6rem}.text-3xl{font-size:1.5rem;line-height:1.8rem}.text-base{font-size:.8rem;line-height:1.2rem}.text-lg{font-size:.9rem;line-height:1.4rem}.text-sm{font-size:.7rem;line-height:1rem}.text-xl{font-size:1rem;line-height:1.4rem}.font-bold{font-weight:700}.font-medium{font-weight:500}.font-semibold{font-weight:600}.leading-6{line-height:1.2rem}.leading-7{line-height:1.4rem}.leading-8{line-height:1.6rem}.tracking-tight{letter-spacing:-.025em}.text-\[\#425C82\]{--tw-text-opacity:1;color:rgb(66 92 130/var(--tw-text-opacity))}.text-black{--tw-text-opacity:1;color:rgb(0 0 0/var(--tw-text-opacity))}.text-gray-200{--tw-text-opacity:1;color:rgb(229 231 235/var(--tw-text-opacity))}.text-gray-600{--tw-text-opacity:1;color:rgb(75 85 99/var(--tw-text-opacity))}.text-gray-800{--tw-text-opacity:1;color:rgb(31 41 55/var(--tw-text-opacity))}.text-gray-900{--tw-text-opacity:1;color:rgb(17 24 39/var(--tw-text-opacity))}.text-white{--tw-text-opacity:1;color:rgb(255 255 255/var(--tw-text-opacity))}.shadow-sm{--tw-shadow:0 1px 2px 0 #0000000d;--tw-shadow-colored:0 1px 2px 0 var(--tw-shadow-color);box-shadow:var(--tw-ring-offset-shadow,0 0 #0000),var(--tw-ring-shadow,0 0 #0000),var(--tw-shadow)}.filter{filter:var(--tw-blur) var(--tw-brightness) var(--tw-contrast) var(--tw-grayscale) var(--tw-hue-rotate) var(--tw-invert) var(--tw-saturate) var(--tw-sepia) var(--tw-drop-shadow)}.image-wrapper{overflow:auto!important}.md-main__inner{padding-bottom:1rem}.hover\:to-\[\#425C82\]:hover{--tw-gradient-to:#425c82 var(--tw-gradient-to-position)}.focus-visible\:outline:focus-visible{outline-style:solid}.focus-visible\:outline-2:focus-visible{outline-width:2px}.focus-visible\:outline-offset-2:focus-visible{outline-offset:2px}.focus-visible\:outline-indigo-400:focus-visible{outline-color:#818cf8}@media (min-width:640px){.sm\:mx-0{margin-left:0;margin-right:0}.sm\:mx-auto{margin-left:auto;margin-right:auto}.sm\:max-w-2xl{max-width:33.6rem}.sm\:max-w-none{max-width:none}.sm\:gap-y-20{row-gap:4rem}.sm\:text-4xl{font-size:1.8rem;line-height:2rem}}@media (min-width:768px){.md\:px-6{padding-left:1.2rem;padding-right:1.2rem}}@media (min-width:1024px){.lg\:mx-0{margin-left:0;margin-right:0}.lg\:max-w-lg{max-width:25.6rem}.lg\:max-w-none{max-width:none}.lg\:grid-cols-2{grid-template-columns:repeat(2,minmax(0,1fr))}.lg\:items-start{align-items:flex-start}.lg\:px-0{padding-left:0;padding-right:0}.lg\:px-8{padding-left:1.6rem;padding-right:1.6rem}.lg\:pl-3{padding-left:.6rem}} \ No newline at end of file +*,:after,:before{--tw-border-spacing-x:0;--tw-border-spacing-y:0;--tw-translate-x:0;--tw-translate-y:0;--tw-rotate:0;--tw-skew-x:0;--tw-skew-y:0;--tw-scale-x:1;--tw-scale-y:1;--tw-pan-x: ;--tw-pan-y: ;--tw-pinch-zoom: ;--tw-scroll-snap-strictness:proximity;--tw-gradient-from-position: ;--tw-gradient-via-position: ;--tw-gradient-to-position: ;--tw-ordinal: ;--tw-slashed-zero: ;--tw-numeric-figure: ;--tw-numeric-spacing: ;--tw-numeric-fraction: ;--tw-ring-inset: ;--tw-ring-offset-width:0px;--tw-ring-offset-color:#fff;--tw-ring-color:rgba(59,130,246,.5);--tw-ring-offset-shadow:0 0 #0000;--tw-ring-shadow:0 0 #0000;--tw-shadow:0 0 #0000;--tw-shadow-colored:0 0 #0000;--tw-blur: ;--tw-brightness: ;--tw-contrast: ;--tw-grayscale: ;--tw-hue-rotate: ;--tw-invert: ;--tw-saturate: ;--tw-sepia: ;--tw-drop-shadow: ;--tw-backdrop-blur: ;--tw-backdrop-brightness: ;--tw-backdrop-contrast: ;--tw-backdrop-grayscale: ;--tw-backdrop-hue-rotate: ;--tw-backdrop-invert: ;--tw-backdrop-opacity: ;--tw-backdrop-saturate: ;--tw-backdrop-sepia: ;--tw-contain-size: ;--tw-contain-layout: ;--tw-contain-paint: ;--tw-contain-style: }::backdrop{--tw-border-spacing-x:0;--tw-border-spacing-y:0;--tw-translate-x:0;--tw-translate-y:0;--tw-rotate:0;--tw-skew-x:0;--tw-skew-y:0;--tw-scale-x:1;--tw-scale-y:1;--tw-pan-x: ;--tw-pan-y: ;--tw-pinch-zoom: ;--tw-scroll-snap-strictness:proximity;--tw-gradient-from-position: ;--tw-gradient-via-position: ;--tw-gradient-to-position: ;--tw-ordinal: ;--tw-slashed-zero: ;--tw-numeric-figure: ;--tw-numeric-spacing: ;--tw-numeric-fraction: ;--tw-ring-inset: ;--tw-ring-offset-width:0px;--tw-ring-offset-color:#fff;--tw-ring-color:rgba(59,130,246,.5);--tw-ring-offset-shadow:0 0 #0000;--tw-ring-shadow:0 0 #0000;--tw-shadow:0 0 #0000;--tw-shadow-colored:0 0 #0000;--tw-blur: ;--tw-brightness: ;--tw-contrast: ;--tw-grayscale: ;--tw-hue-rotate: ;--tw-invert: ;--tw-saturate: ;--tw-sepia: ;--tw-drop-shadow: ;--tw-backdrop-blur: ;--tw-backdrop-brightness: ;--tw-backdrop-contrast: ;--tw-backdrop-grayscale: ;--tw-backdrop-hue-rotate: ;--tw-backdrop-invert: ;--tw-backdrop-opacity: ;--tw-backdrop-saturate: ;--tw-backdrop-sepia: ;--tw-contain-size: ;--tw-contain-layout: ;--tw-contain-paint: ;--tw-contain-style: }/*! tailwindcss v3.4.14 | MIT License | https://tailwindcss.com*/*,:after,:before{border:0 solid #e5e7eb;box-sizing:border-box}:after,:before{--tw-content:""}:host,html{line-height:1.5;-webkit-text-size-adjust:100%;font-family:ui-sans-serif,system-ui,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol,Noto Color Emoji;font-feature-settings:normal;font-variation-settings:normal;-moz-tab-size:4;-o-tab-size:4;tab-size:4;-webkit-tap-highlight-color:transparent}body{line-height:inherit;margin:0}hr{border-top-width:1px;color:inherit;height:0}abbr:where([title]){-webkit-text-decoration:underline dotted;text-decoration:underline dotted}h1,h2,h3,h4,h5,h6{font-size:inherit;font-weight:inherit}a{color:inherit;text-decoration:inherit}b,strong{font-weight:bolder}code,kbd,pre,samp{font-family:ui-monospace,SFMono-Regular,Menlo,Monaco,Consolas,Liberation Mono,Courier New,monospace;font-feature-settings:normal;font-size:1em;font-variation-settings:normal}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sub{bottom:-.25em}sup{top:-.5em}table{border-collapse:collapse;border-color:inherit;text-indent:0}button,input,optgroup,select,textarea{color:inherit;font-family:inherit;font-feature-settings:inherit;font-size:100%;font-variation-settings:inherit;font-weight:inherit;letter-spacing:inherit;line-height:inherit;margin:0;padding:0}button,select{text-transform:none}button,input:where([type=button]),input:where([type=reset]),input:where([type=submit]){-webkit-appearance:button;background-color:transparent;background-image:none}:-moz-focusring{outline:auto}:-moz-ui-invalid{box-shadow:none}progress{vertical-align:baseline}::-webkit-inner-spin-button,::-webkit-outer-spin-button{height:auto}[type=search]{-webkit-appearance:textfield;outline-offset:-2px}::-webkit-search-decoration{-webkit-appearance:none}::-webkit-file-upload-button{-webkit-appearance:button;font:inherit}summary{display:list-item}blockquote,dd,dl,figure,h1,h2,h3,h4,h5,h6,hr,p,pre{margin:0}fieldset{margin:0}fieldset,legend{padding:0}menu,ol,ul{list-style:none;margin:0;padding:0}dialog{padding:0}textarea{resize:vertical}input::-moz-placeholder,textarea::-moz-placeholder{color:#9ca3af;opacity:1}input::placeholder,textarea::placeholder{color:#9ca3af;opacity:1}[role=button],button{cursor:pointer}:disabled{cursor:default}audio,canvas,embed,iframe,img,object,svg,video{display:block;vertical-align:middle}img,video{height:auto;max-width:100%}[hidden]:where(:not([hidden=until-found])){display:none}html{font-size:20px}.container{width:100%}@media (min-width:640px){.container{max-width:640px}}@media (min-width:768px){.container{max-width:768px}}@media (min-width:1024px){.container{max-width:1024px}}@media (min-width:1280px){.container{max-width:1280px}}@media (min-width:1536px){.container{max-width:1536px}}.language-shell:before{content:attr(data-shell-prefix);margin-inline-end:.4rem;--tw-text-opacity:1;color:rgb(147 197 253/var(--tw-text-opacity))}.static{position:static}.relative{position:relative}.isolate{isolation:isolate}.mx-auto{margin-left:auto;margin-right:auto}.mb-6{margin-bottom:1.2rem}.mt-10{margin-top:2rem}.mt-2{margin-top:.4rem}.mt-4{margin-top:.8rem}.mt-6{margin-top:1.2rem}.block{display:block}.inline{display:inline}.flex{display:flex}.grid{display:grid}.h-8{height:1.6rem}.max-w-2xl{max-width:33.6rem}.max-w-3xl{max-width:38.4rem}.max-w-7xl{max-width:64rem}.max-w-xl{max-width:28.8rem}.grid-cols-1{grid-template-columns:repeat(1,minmax(0,1fr))}.items-center{align-items:center}.justify-center{justify-content:center}.gap-x-6{-moz-column-gap:1.2rem;column-gap:1.2rem}.gap-x-8{-moz-column-gap:1.6rem;column-gap:1.6rem}.gap-y-16{row-gap:3.2rem}.space-y-8>:not([hidden])~:not([hidden]){--tw-space-y-reverse:0;margin-bottom:calc(1.6rem*var(--tw-space-y-reverse));margin-top:calc(1.6rem*(1 - var(--tw-space-y-reverse)))}.overflow-hidden,.truncate{overflow:hidden}.truncate{text-overflow:ellipsis;white-space:nowrap}.rounded-md{border-radius:.3rem}.rounded-b-xl{border-bottom-left-radius:.6rem;border-bottom-right-radius:.6rem}.border-b{border-bottom-width:1px}.border-r{border-right-width:1px}.border-t{border-top-width:1px}.border-b-white\/20{border-bottom-color:hsla(0,0%,100%,.2)}.border-r-white\/10{border-right-color:hsla(0,0%,100%,.1)}.border-t-white\/20{border-top-color:hsla(0,0%,100%,.2)}.bg-black{--tw-bg-opacity:1;background-color:rgb(0 0 0/var(--tw-bg-opacity))}.bg-gray-100{--tw-bg-opacity:1;background-color:rgb(243 244 246/var(--tw-bg-opacity))}.bg-gray-800\/40{background-color:rgba(31,41,55,.4)}.bg-gray-900{--tw-bg-opacity:1;background-color:rgb(17 24 39/var(--tw-bg-opacity))}.bg-white{--tw-bg-opacity:1;background-color:rgb(255 255 255/var(--tw-bg-opacity))}.bg-white\/5{background-color:hsla(0,0%,100%,.05)}.p-1{padding:.2rem}.px-2{padding-left:.4rem;padding-right:.4rem}.px-3\.5{padding-left:.7rem;padding-right:.7rem}.px-4{padding-left:.8rem;padding-right:.8rem}.py-14{padding-bottom:2.8rem;padding-top:2.8rem}.py-2\.5{padding-bottom:.5rem;padding-top:.5rem}.py-8{padding-bottom:1.6rem;padding-top:1.6rem}.pt-14{padding-top:2.8rem}.text-center{text-align:center}.text-2xl{font-size:1.2rem;line-height:1.6rem}.text-3xl{font-size:1.5rem;line-height:1.8rem}.text-base{font-size:.8rem;line-height:1.2rem}.text-lg{font-size:.9rem;line-height:1.4rem}.text-sm{font-size:.7rem;line-height:1rem}.text-xl{font-size:1rem;line-height:1.4rem}.font-bold{font-weight:700}.font-medium{font-weight:500}.font-semibold{font-weight:600}.leading-6{line-height:1.2rem}.leading-7{line-height:1.4rem}.leading-8{line-height:1.6rem}.tracking-tight{letter-spacing:-.025em}.text-\[\#425C82\]{--tw-text-opacity:1;color:rgb(66 92 130/var(--tw-text-opacity))}.text-black{--tw-text-opacity:1;color:rgb(0 0 0/var(--tw-text-opacity))}.text-gray-200{--tw-text-opacity:1;color:rgb(229 231 235/var(--tw-text-opacity))}.text-gray-600{--tw-text-opacity:1;color:rgb(75 85 99/var(--tw-text-opacity))}.text-gray-800{--tw-text-opacity:1;color:rgb(31 41 55/var(--tw-text-opacity))}.text-gray-900{--tw-text-opacity:1;color:rgb(17 24 39/var(--tw-text-opacity))}.text-white{--tw-text-opacity:1;color:rgb(255 255 255/var(--tw-text-opacity))}.shadow-sm{--tw-shadow:0 1px 2px 0 rgba(0,0,0,.05);--tw-shadow-colored:0 1px 2px 0 var(--tw-shadow-color);box-shadow:var(--tw-ring-offset-shadow,0 0 #0000),var(--tw-ring-shadow,0 0 #0000),var(--tw-shadow)}.filter{filter:var(--tw-blur) var(--tw-brightness) var(--tw-contrast) var(--tw-grayscale) var(--tw-hue-rotate) var(--tw-invert) var(--tw-saturate) var(--tw-sepia) var(--tw-drop-shadow)}.image-wrapper{overflow:auto!important}.md-main__inner{padding-bottom:1rem}.hover\:to-\[\#425C82\]:hover{--tw-gradient-to:#425c82 var(--tw-gradient-to-position)}.focus-visible\:outline:focus-visible{outline-style:solid}.focus-visible\:outline-2:focus-visible{outline-width:2px}.focus-visible\:outline-offset-2:focus-visible{outline-offset:2px}.focus-visible\:outline-indigo-400:focus-visible{outline-color:#818cf8}@media (min-width:640px){.sm\:mx-0{margin-left:0;margin-right:0}.sm\:mx-auto{margin-left:auto;margin-right:auto}.sm\:max-w-2xl{max-width:33.6rem}.sm\:max-w-none{max-width:none}.sm\:gap-y-20{row-gap:4rem}.sm\:text-4xl{font-size:1.8rem;line-height:2rem}}@media (min-width:768px){.md\:px-6{padding-left:1.2rem;padding-right:1.2rem}}@media (min-width:1024px){.lg\:mx-0{margin-left:0;margin-right:0}.lg\:max-w-lg{max-width:25.6rem}.lg\:max-w-none{max-width:none}.lg\:grid-cols-2{grid-template-columns:repeat(2,minmax(0,1fr))}.lg\:items-start{align-items:flex-start}.lg\:px-0{padding-left:0;padding-right:0}.lg\:px-8{padding-left:1.6rem;padding-right:1.6rem}.lg\:pl-3{padding-left:.6rem}} \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index 80d03b7f0..463a5238a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -49,20 +49,26 @@ mergedeep==1.3.4 # mkdocs-get-deps mkdocs==1.6.0 # via + # -r requirements.in # mkdocs-awesome-pages-plugin # mkdocs-include-markdown-plugin # mkdocs-markdownextradata-plugin # mkdocs-material # mkdocs-rss-plugin mkdocs-awesome-pages-plugin==2.9.3 + # via -r requirements.in mkdocs-get-deps==0.2.0 # via mkdocs mkdocs-include-markdown-plugin==6.2.1 + # via -r requirements.in mkdocs-markdownextradata-plugin==0.2.5 + # via -r requirements.in mkdocs-material==9.5.31 + # via -r requirements.in mkdocs-material-extensions==1.3.1 # via mkdocs-material mkdocs-rss-plugin==1.13.1 + # via -r requirements.in natsort==8.4.0 # via mkdocs-awesome-pages-plugin packaging==24.1 From 4986b6ee6dab1334827cdb36218d69c1915d7c1c Mon Sep 17 00:00:00 2001 From: Sander Date: Tue, 19 Nov 2024 23:27:18 +0400 Subject: [PATCH 14/28] python: sprinkle exits in setup scripts to trigger task errors --- src/modules/languages/python.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/modules/languages/python.nix b/src/modules/languages/python.nix index 06f92ec49..2e4aa7090 100644 --- a/src/modules/languages/python.nix +++ b/src/modules/languages/python.nix @@ -159,6 +159,7 @@ let echo "$ACTUAL_UV_CHECKSUM" > "$UV_CHECKSUM_FILE" else echo "uv sync failed. Run 'uv sync' manually." >&2 + exit 1 fi fi } @@ -166,6 +167,7 @@ let if [ ! -f "pyproject.toml" ] then echo "No pyproject.toml found. Make sure you have a pyproject.toml file in your project." >&2 + exit 1 else _devenv_uv_sync fi @@ -208,6 +210,7 @@ let echo "$ACTUAL_POETRY_CHECKSUM" > "$POETRY_CHECKSUM_FILE" else echo "Poetry install failed. Run 'poetry install' manually." + exit 1 fi fi } @@ -215,6 +218,7 @@ let if [ ! -f "pyproject.toml" ] then echo "No pyproject.toml found. Run 'poetry init' to create one." >&2 + exit 1 else _devenv_init_poetry_venv ${lib.optionalString cfg.poetry.install.enable '' From c403b3f0fecba840f3d87200444580e85062d430 Mon Sep 17 00:00:00 2001 From: Sander Date: Tue, 19 Nov 2024 23:28:18 +0400 Subject: [PATCH 15/28] examples: bump python-poetry lockfile --- examples/python-poetry/poetry.lock | 79 ++++++++++++++++-------------- 1 file changed, 43 insertions(+), 36 deletions(-) diff --git a/examples/python-poetry/poetry.lock b/examples/python-poetry/poetry.lock index 9697c9d88..ef821039e 100644 --- a/examples/python-poetry/poetry.lock +++ b/examples/python-poetry/poetry.lock @@ -1,44 +1,51 @@ +# This file is automatically @generated by Poetry 1.8.4 and should not be changed by hand. + [[package]] name = "numpy" -version = "1.24.1" +version = "1.26.4" description = "Fundamental package for array computing in Python" -category = "main" optional = false -python-versions = ">=3.8" +python-versions = ">=3.9" +files = [ + {file = "numpy-1.26.4-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:9ff0f4f29c51e2803569d7a51c2304de5554655a60c5d776e35b4a41413830d0"}, + {file = "numpy-1.26.4-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:2e4ee3380d6de9c9ec04745830fd9e2eccb3e6cf790d39d7b98ffd19b0dd754a"}, + {file = "numpy-1.26.4-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d209d8969599b27ad20994c8e41936ee0964e6da07478d6c35016bc386b66ad4"}, + {file = "numpy-1.26.4-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ffa75af20b44f8dba823498024771d5ac50620e6915abac414251bd971b4529f"}, + {file = "numpy-1.26.4-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:62b8e4b1e28009ef2846b4c7852046736bab361f7aeadeb6a5b89ebec3c7055a"}, + {file = "numpy-1.26.4-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:a4abb4f9001ad2858e7ac189089c42178fcce737e4169dc61321660f1a96c7d2"}, + {file = "numpy-1.26.4-cp310-cp310-win32.whl", hash = "sha256:bfe25acf8b437eb2a8b2d49d443800a5f18508cd811fea3181723922a8a82b07"}, + {file = "numpy-1.26.4-cp310-cp310-win_amd64.whl", hash = "sha256:b97fe8060236edf3662adfc2c633f56a08ae30560c56310562cb4f95500022d5"}, + {file = "numpy-1.26.4-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:4c66707fabe114439db9068ee468c26bbdf909cac0fb58686a42a24de1760c71"}, + {file = "numpy-1.26.4-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:edd8b5fe47dab091176d21bb6de568acdd906d1887a4584a15a9a96a1dca06ef"}, + {file = "numpy-1.26.4-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:7ab55401287bfec946ced39700c053796e7cc0e3acbef09993a9ad2adba6ca6e"}, + {file = "numpy-1.26.4-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:666dbfb6ec68962c033a450943ded891bed2d54e6755e35e5835d63f4f6931d5"}, + {file = "numpy-1.26.4-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:96ff0b2ad353d8f990b63294c8986f1ec3cb19d749234014f4e7eb0112ceba5a"}, + {file = "numpy-1.26.4-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:60dedbb91afcbfdc9bc0b1f3f402804070deed7392c23eb7a7f07fa857868e8a"}, + {file = "numpy-1.26.4-cp311-cp311-win32.whl", hash = "sha256:1af303d6b2210eb850fcf03064d364652b7120803a0b872f5211f5234b399f20"}, + {file = "numpy-1.26.4-cp311-cp311-win_amd64.whl", hash = "sha256:cd25bcecc4974d09257ffcd1f098ee778f7834c3ad767fe5db785be9a4aa9cb2"}, + {file = "numpy-1.26.4-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:b3ce300f3644fb06443ee2222c2201dd3a89ea6040541412b8fa189341847218"}, + {file = "numpy-1.26.4-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:03a8c78d01d9781b28a6989f6fa1bb2c4f2d51201cf99d3dd875df6fbd96b23b"}, + {file = "numpy-1.26.4-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9fad7dcb1aac3c7f0584a5a8133e3a43eeb2fe127f47e3632d43d677c66c102b"}, + {file = "numpy-1.26.4-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:675d61ffbfa78604709862923189bad94014bef562cc35cf61d3a07bba02a7ed"}, + {file = "numpy-1.26.4-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:ab47dbe5cc8210f55aa58e4805fe224dac469cde56b9f731a4c098b91917159a"}, + {file = "numpy-1.26.4-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:1dda2e7b4ec9dd512f84935c5f126c8bd8b9f2fc001e9f54af255e8c5f16b0e0"}, + {file = "numpy-1.26.4-cp312-cp312-win32.whl", hash = "sha256:50193e430acfc1346175fcbdaa28ffec49947a06918b7b92130744e81e640110"}, + {file = "numpy-1.26.4-cp312-cp312-win_amd64.whl", hash = "sha256:08beddf13648eb95f8d867350f6a018a4be2e5ad54c8d8caed89ebca558b2818"}, + {file = "numpy-1.26.4-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:7349ab0fa0c429c82442a27a9673fc802ffdb7c7775fad780226cb234965e53c"}, + {file = "numpy-1.26.4-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:52b8b60467cd7dd1e9ed082188b4e6bb35aa5cdd01777621a1658910745b90be"}, + {file = "numpy-1.26.4-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d5241e0a80d808d70546c697135da2c613f30e28251ff8307eb72ba696945764"}, + {file = "numpy-1.26.4-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f870204a840a60da0b12273ef34f7051e98c3b5961b61b0c2c1be6dfd64fbcd3"}, + {file = "numpy-1.26.4-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:679b0076f67ecc0138fd2ede3a8fd196dddc2ad3254069bcb9faf9a79b1cebcd"}, + {file = "numpy-1.26.4-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:47711010ad8555514b434df65f7d7b076bb8261df1ca9bb78f53d3b2db02e95c"}, + {file = "numpy-1.26.4-cp39-cp39-win32.whl", hash = "sha256:a354325ee03388678242a4d7ebcd08b5c727033fcff3b2f536aea978e15ee9e6"}, + {file = "numpy-1.26.4-cp39-cp39-win_amd64.whl", hash = "sha256:3373d5d70a5fe74a2c1bb6d2cfd9609ecf686d47a2d7b1d37a8f3b6bf6003aea"}, + {file = "numpy-1.26.4-pp39-pypy39_pp73-macosx_10_9_x86_64.whl", hash = "sha256:afedb719a9dcfc7eaf2287b839d8198e06dcd4cb5d276a3df279231138e83d30"}, + {file = "numpy-1.26.4-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:95a7476c59002f2f6c590b9b7b998306fba6a5aa646b1e22ddfeaf8f78c3a29c"}, + {file = "numpy-1.26.4-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:7e50d0a0cc3189f9cb0aeb3a6a6af18c16f59f004b866cd2be1c14b36134a4a0"}, + {file = "numpy-1.26.4.tar.gz", hash = "sha256:2a02aba9ed12e4ac4eb3ea9421c420301a0c6460d9830d74a9df87efa4912010"}, +] [metadata] -lock-version = "1.1" +lock-version = "2.0" python-versions = "^3.10" content-hash = "4c2505218626e7e6ed874319d095e221c5412d1b89019d7b2b919c8cb52e770e" - -[metadata.files] -numpy = [ - {file = "numpy-1.24.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:179a7ef0889ab769cc03573b6217f54c8bd8e16cef80aad369e1e8185f994cd7"}, - {file = "numpy-1.24.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:b09804ff570b907da323b3d762e74432fb07955701b17b08ff1b5ebaa8cfe6a9"}, - {file = "numpy-1.24.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f1b739841821968798947d3afcefd386fa56da0caf97722a5de53e07c4ccedc7"}, - {file = "numpy-1.24.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0e3463e6ac25313462e04aea3fb8a0a30fb906d5d300f58b3bc2c23da6a15398"}, - {file = "numpy-1.24.1-cp310-cp310-win32.whl", hash = "sha256:b31da69ed0c18be8b77bfce48d234e55d040793cebb25398e2a7d84199fbc7e2"}, - {file = "numpy-1.24.1-cp310-cp310-win_amd64.whl", hash = "sha256:b07b40f5fb4fa034120a5796288f24c1fe0e0580bbfff99897ba6267af42def2"}, - {file = "numpy-1.24.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:7094891dcf79ccc6bc2a1f30428fa5edb1e6fb955411ffff3401fb4ea93780a8"}, - {file = "numpy-1.24.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:28e418681372520c992805bb723e29d69d6b7aa411065f48216d8329d02ba032"}, - {file = "numpy-1.24.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e274f0f6c7efd0d577744f52032fdd24344f11c5ae668fe8d01aac0422611df1"}, - {file = "numpy-1.24.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0044f7d944ee882400890f9ae955220d29b33d809a038923d88e4e01d652acd9"}, - {file = "numpy-1.24.1-cp311-cp311-win32.whl", hash = "sha256:442feb5e5bada8408e8fcd43f3360b78683ff12a4444670a7d9e9824c1817d36"}, - {file = "numpy-1.24.1-cp311-cp311-win_amd64.whl", hash = "sha256:de92efa737875329b052982e37bd4371d52cabf469f83e7b8be9bb7752d67e51"}, - {file = "numpy-1.24.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:b162ac10ca38850510caf8ea33f89edcb7b0bb0dfa5592d59909419986b72407"}, - {file = "numpy-1.24.1-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:26089487086f2648944f17adaa1a97ca6aee57f513ba5f1c0b7ebdabbe2b9954"}, - {file = "numpy-1.24.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:caf65a396c0d1f9809596be2e444e3bd4190d86d5c1ce21f5fc4be60a3bc5b36"}, - {file = "numpy-1.24.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b0677a52f5d896e84414761531947c7a330d1adc07c3a4372262f25d84af7bf7"}, - {file = "numpy-1.24.1-cp38-cp38-win32.whl", hash = "sha256:dae46bed2cb79a58d6496ff6d8da1e3b95ba09afeca2e277628171ca99b99db1"}, - {file = "numpy-1.24.1-cp38-cp38-win_amd64.whl", hash = "sha256:6ec0c021cd9fe732e5bab6401adea5a409214ca5592cd92a114f7067febcba0c"}, - {file = "numpy-1.24.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:28bc9750ae1f75264ee0f10561709b1462d450a4808cd97c013046073ae64ab6"}, - {file = "numpy-1.24.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:84e789a085aabef2f36c0515f45e459f02f570c4b4c4c108ac1179c34d475ed7"}, - {file = "numpy-1.24.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8e669fbdcdd1e945691079c2cae335f3e3a56554e06bbd45d7609a6cf568c700"}, - {file = "numpy-1.24.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ef85cf1f693c88c1fd229ccd1055570cb41cdf4875873b7728b6301f12cd05bf"}, - {file = "numpy-1.24.1-cp39-cp39-win32.whl", hash = "sha256:87a118968fba001b248aac90e502c0b13606721b1343cdaddbc6e552e8dfb56f"}, - {file = "numpy-1.24.1-cp39-cp39-win_amd64.whl", hash = "sha256:ddc7ab52b322eb1e40521eb422c4e0a20716c271a306860979d450decbb51b8e"}, - {file = "numpy-1.24.1-pp38-pypy38_pp73-macosx_10_9_x86_64.whl", hash = "sha256:ed5fb71d79e771ec930566fae9c02626b939e37271ec285e9efaf1b5d4370e7d"}, - {file = "numpy-1.24.1-pp38-pypy38_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ad2925567f43643f51255220424c23d204024ed428afc5aad0f86f3ffc080086"}, - {file = "numpy-1.24.1-pp38-pypy38_pp73-win_amd64.whl", hash = "sha256:cfa1161c6ac8f92dea03d625c2d0c05e084668f4a06568b77a25a89111621566"}, - {file = "numpy-1.24.1.tar.gz", hash = "sha256:2386da9a471cc00a1f47845e27d916d5ec5346ae9696e01a8a34760858fe9dd2"}, -] From f812864bd27fe1cd9cbaa2322bc13437d2190cac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Thu, 28 Nov 2024 15:36:33 +0000 Subject: [PATCH 16/28] services: mongodb use binary distro --- src/modules/services/mongodb.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/services/mongodb.nix b/src/modules/services/mongodb.nix index 597413751..925b6d6c4 100644 --- a/src/modules/services/mongodb.nix +++ b/src/modules/services/mongodb.nix @@ -73,8 +73,8 @@ in package = mkOption { type = types.package; description = "Which MongoDB package to use."; - default = pkgs.mongodb-6_0; - defaultText = lib.literalExpression "pkgs.mongodb"; + default = pkgs.mongodb-ce; + defaultText = lib.literalExpression "pkgs.mongodb-ce"; }; additionalArgs = lib.mkOption { From 92a77902e92dd1ad0871cdc339e537cf1803bb89 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 28 Nov 2024 15:43:53 +0000 Subject: [PATCH 17/28] Auto generate docs/reference/options.md --- docs/reference/options.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/reference/options.md b/docs/reference/options.md index 85abcd61c..362373d62 100644 --- a/docs/reference/options.md +++ b/docs/reference/options.md @@ -33937,7 +33937,7 @@ boolean *Default:* -` true ` +` false ` *Declared by:* - [https://github.com/cachix/devenv/blob/main/src/modules/languages/python.nix](https://github.com/cachix/devenv/blob/main/src/modules/languages/python.nix) @@ -68859,7 +68859,7 @@ package *Default:* -` pkgs.mongodb ` +` pkgs.mongodb-ce ` *Declared by:* - [https://github.com/cachix/devenv/blob/main/src/modules/services/mongodb.nix](https://github.com/cachix/devenv/blob/main/src/modules/services/mongodb.nix) From 7f17636db872a51a0253485a3d9e8daf6e730bd1 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 28 Nov 2024 15:44:55 +0000 Subject: [PATCH 18/28] Auto generate docs and examples --- docs/supported-languages/python.md | 2 +- docs/supported-services/mongodb.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/supported-languages/python.md b/docs/supported-languages/python.md index 88940c54b..749344adf 100644 --- a/docs/supported-languages/python.md +++ b/docs/supported-languages/python.md @@ -108,7 +108,7 @@ boolean *Default:* -` true ` +` false ` diff --git a/docs/supported-services/mongodb.md b/docs/supported-services/mongodb.md index 04e27ae4d..09e49cd66 100644 --- a/docs/supported-services/mongodb.md +++ b/docs/supported-services/mongodb.md @@ -40,7 +40,7 @@ package *Default:* -` pkgs.mongodb ` +` pkgs.mongodb-ce ` From 54351468ae839ee51085a1a399916bcdd7a8da2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Thu, 28 Nov 2024 15:39:24 +0000 Subject: [PATCH 19/28] python: disable manylinux as it causes trouble --- src/modules/languages/python.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/languages/python.nix b/src/modules/languages/python.nix index 2e4aa7090..2970d7ca3 100644 --- a/src/modules/languages/python.nix +++ b/src/modules/languages/python.nix @@ -245,7 +245,7 @@ in manylinux.enable = lib.mkOption { type = lib.types.bool; - default = pkgs.stdenv.isLinux; + default = false; description = '' Whether to install manylinux2014 libraries. From 9cd2f9e32c85ad8a8af196d3287dfeeab0aac4c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Fri, 29 Nov 2024 09:59:04 +0000 Subject: [PATCH 20/28] fail examples if they can't be generated --- .github/workflows/buildtest.yml | 225 ++++++++++++++++++-------------- 1 file changed, 128 insertions(+), 97 deletions(-) diff --git a/.github/workflows/buildtest.yml b/.github/workflows/buildtest.yml index 2e13bbd91..e7ae81980 100644 --- a/.github/workflows/buildtest.yml +++ b/.github/workflows/buildtest.yml @@ -13,50 +13,62 @@ jobs: strategy: fail-fast: false matrix: - os: [[self-hosted, linux, X64], [macos-13], [self-hosted, macOS, ARM64], [self-hosted, linux, ARM64]] + os: + [ + [self-hosted, linux, X64], + [macos-13], + [self-hosted, macOS, ARM64], + [self-hosted, linux, ARM64], + ] runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v4 - - uses: cachix/install-nix-action@v30 - with: - extra_nix_config: | - access-tokens = github.com=${{ secrets.GITHUB_TOKEN }} - - uses: cachix/cachix-action@v15 - with: - name: devenv - authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' - - id: build - run: | - bin=$(nix build --print-out-paths) - echo "bin=$bin" >> $GITHUB_OUTPUT - - name: Run tests - run: ./result/bin/devenv test + - uses: actions/checkout@v4 + - uses: cachix/install-nix-action@v30 + with: + extra_nix_config: | + access-tokens = github.com=${{ secrets.GITHUB_TOKEN }} + - uses: cachix/cachix-action@v15 + with: + name: devenv + authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}" + - id: build + run: | + bin=$(nix build --print-out-paths) + echo "bin=$bin" >> $GITHUB_OUTPUT + - name: Run tests + run: ./result/bin/devenv test tests: needs: build strategy: fail-fast: false matrix: - os: [[self-hosted, linux, X64], [macos-13], [self-hosted, macOS, ARM64], [self-hosted, linux, ARM64]] + os: + [ + [self-hosted, linux, X64], + [macos-13], + [self-hosted, macOS, ARM64], + [self-hosted, linux, ARM64], + ] runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v4 - - uses: cachix/install-nix-action@v30 - with: - extra_nix_config: | - access-tokens = github.com=${{ secrets.GITHUB_TOKEN }} - - uses: cachix/cachix-action@v15 - with: - name: devenv - authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' - - name: Build devenv - run: | - nix build - echo "$PWD/result/bin" >> $GITHUB_PATH - - name: Run devenv-test-cli - run: devenv shell devenv-test-cli - - name: Run tests - run: devenv-run-tests tests + - uses: actions/checkout@v4 + - uses: cachix/install-nix-action@v30 + with: + extra_nix_config: | + access-tokens = github.com=${{ secrets.GITHUB_TOKEN }} + - uses: cachix/cachix-action@v15 + with: + name: devenv + authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}" + - name: Build devenv + run: | + nix build + echo "$PWD/result/bin" >> $GITHUB_PATH + - name: Run devenv-test-cli + run: devenv shell devenv-test-cli + - name: Run tests + run: devenv-run-tests tests pin: needs: build @@ -69,13 +81,14 @@ jobs: outputs: examples: ${{ steps.set-examples.outputs.examples }} steps: - - name: Checkout base repo - uses: actions/checkout@v4 - - name: Fetch examples to run - id: set-examples - run: | - json=$(nix shell nixpkgs#tree -c tree -J -L 1 examples | nix shell nixpkgs#jq -c jq -c '[.[0].contents[] | .name]') - echo "examples=$json" >> $GITHUB_OUTPUT + - name: Checkout base repo + uses: actions/checkout@v4 + - name: Fetch examples to run + id: set-examples + run: | + set -euxo pipefail + json=$(nix shell nixpkgs#tree -c tree -J -L 1 examples | nix shell nixpkgs#jq -c jq -c '[.[0].contents[] | .name]') + echo "examples=$json" >> $GITHUB_OUTPUT examples: name: ${{ matrix.example }} (${{ join(matrix.os) }}) @@ -83,26 +96,32 @@ jobs: strategy: fail-fast: false matrix: - os: [[self-hosted, linux, X64], [macos-13], [self-hosted, macOS, ARM64], [self-hosted, linux, ARM64]] + os: + [ + [self-hosted, linux, X64], + [macos-13], + [self-hosted, macOS, ARM64], + [self-hosted, linux, ARM64], + ] example: ${{ fromJSON(needs.generate-examples.outputs.examples) }} runs-on: ${{ matrix.os }} steps: - - run: sudo rm -rf /opt& - - uses: actions/checkout@v4 - - uses: cachix/install-nix-action@v30 - with: - extra_nix_config: | - access-tokens = github.com=${{ secrets.GITHUB_TOKEN }} - - uses: cachix/cachix-action@v15 - with: - name: devenv - authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' - - name: Build devenv - run: | - nix build - echo "$PWD/result/bin" >> $GITHUB_PATH - - name: Run examples - run: devenv-run-tests --only ${{ matrix.example }} examples + - run: sudo rm -rf /opt& + - uses: actions/checkout@v4 + - uses: cachix/install-nix-action@v30 + with: + extra_nix_config: | + access-tokens = github.com=${{ secrets.GITHUB_TOKEN }} + - uses: cachix/cachix-action@v15 + with: + name: devenv + authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}" + - name: Build devenv + run: | + nix build + echo "$PWD/result/bin" >> $GITHUB_PATH + - name: Run examples + run: devenv-run-tests --only ${{ matrix.example }} examples direnv: name: direnv (${{ join(matrix.os) }}) @@ -110,33 +129,39 @@ jobs: strategy: fail-fast: false matrix: - os: [[ubuntu-latest], [macos-13], [self-hosted, macOS, ARM64], [self-hosted, Linux, ARM64]] + os: + [ + [ubuntu-latest], + [macos-13], + [self-hosted, macOS, ARM64], + [self-hosted, Linux, ARM64], + ] runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v4 - - uses: cachix/install-nix-action@v30 - with: - nix_path: nixpkgs=channel:nixos-unstable - - uses: cachix/cachix-action@v15 - with: - name: devenv - authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' - - name: Build devenv - run: | - nix build - echo "$PWD/result/bin" >> $GITHUB_PATH - - run: | - mkdir -p ~/.config/direnv/ - cat > ~/.config/direnv/direnv.toml << 'EOF' - [global] - strict_env = true - EOF + - uses: actions/checkout@v4 + - uses: cachix/install-nix-action@v30 + with: + nix_path: nixpkgs=channel:nixos-unstable + - uses: cachix/cachix-action@v15 + with: + name: devenv + authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}" + - name: Build devenv + run: | + nix build + echo "$PWD/result/bin" >> $GITHUB_PATH + - run: | + mkdir -p ~/.config/direnv/ + cat > ~/.config/direnv/direnv.toml << 'EOF' + [global] + strict_env = true + EOF - devenv_dir=$PWD - tmp="$(mktemp -d)" - pushd "$tmp" - nix shell nixpkgs#direnv -c devenv --override-input devenv path:$devenv_dir?dir=src/modules init - popd + devenv_dir=$PWD + tmp="$(mktemp -d)" + pushd "$tmp" + nix shell nixpkgs#direnv -c devenv --override-input devenv path:$devenv_dir?dir=src/modules init + popd fish-zsh: name: zsh/fish (${{ join(matrix.os) }}) @@ -144,20 +169,26 @@ jobs: strategy: fail-fast: false matrix: - os: [[ubuntu-latest], [macos-13], [self-hosted, macOS, ARM64], [self-hosted, linux, ARM64]] + os: + [ + [ubuntu-latest], + [macos-13], + [self-hosted, macOS, ARM64], + [self-hosted, linux, ARM64], + ] runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v4 - - uses: cachix/install-nix-action@v30 - with: - nix_path: nixpkgs=channel:nixos-unstable - - uses: cachix/cachix-action@v15 - with: - name: devenv - authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' - - name: Build devenv - run: nix build - - name: Test devenv in fish and zsh - run: | - nix shell nixpkgs#zsh -c zsh -c "./result/bin/devenv version" - nix shell nixpkgs#fish -c fish -c "./result/bin/devenv version" + - uses: actions/checkout@v4 + - uses: cachix/install-nix-action@v30 + with: + nix_path: nixpkgs=channel:nixos-unstable + - uses: cachix/cachix-action@v15 + with: + name: devenv + authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}" + - name: Build devenv + run: nix build + - name: Test devenv in fish and zsh + run: | + nix shell nixpkgs#zsh -c zsh -c "./result/bin/devenv version" + nix shell nixpkgs#fish -c fish -c "./result/bin/devenv version" From 38be74c741eea505fbe453a5005e1f6eea3cfcf0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Fri, 29 Nov 2024 15:33:13 +0000 Subject: [PATCH 21/28] bump deps --- devenv.lock | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/devenv.lock b/devenv.lock index 96da173ba..92684dd07 100644 --- a/devenv.lock +++ b/devenv.lock @@ -16,10 +16,10 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1696426674, + "lastModified": 1732722421, "owner": "edolstra", "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "rev": "9ed2ac151eada2306ca8c418ebd97807bb08f6ac", "type": "github" }, "original": { @@ -31,10 +31,10 @@ "flake-compat_2": { "flake": false, "locked": { - "lastModified": 1696426674, + "lastModified": 1732722421, "owner": "edolstra", "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "rev": "9ed2ac151eada2306ca8c418ebd97807bb08f6ac", "type": "github" }, "original": { @@ -73,10 +73,10 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1731363552, + "lastModified": 1732021966, "owner": "cachix", "repo": "git-hooks.nix", - "rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0", + "rev": "3308484d1a443fc5bc92012435d79e80458fe43c", "type": "github" }, "original": { @@ -108,10 +108,10 @@ "libgit2": { "flake": false, "locked": { - "lastModified": 1730231647, + "lastModified": 1732660327, "owner": "libgit2", "repo": "libgit2", - "rev": "c6111ec06cc0b0126cd67bdab78f8091e4cfaa10", + "rev": "c86842f0a518cc15d7964027d01a4ae3bf9604db", "type": "github" }, "original": { @@ -146,10 +146,10 @@ }, "nixpkgs": { "locked": { - "lastModified": 1731954261, + "lastModified": 1732887538, "owner": "NixOS", "repo": "nixpkgs", - "rev": "ad2c28c6c5cc04e09bed68db46db5718d40b5b9e", + "rev": "2e212b2e1fad641d3721f8b1b530747ff4287905", "type": "github" }, "original": { @@ -191,10 +191,10 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1731797254, + "lastModified": 1732749044, "owner": "NixOS", "repo": "nixpkgs", - "rev": "e8c38b73aeb218e27163376a2d617e61a2ad9b59", + "rev": "0c5b4ecbed5b155b705336aa96d878e55acd8685", "type": "github" }, "original": { @@ -206,10 +206,10 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1731890469, + "lastModified": 1732780316, "owner": "cachix", "repo": "devenv-nixpkgs", - "rev": "5083ec887760adfe12af64830a66807423a859a7", + "rev": "226216574ada4c3ecefcbbec41f39ce4655f78ef", "type": "github" }, "original": { @@ -237,10 +237,10 @@ ] }, "locked": { - "lastModified": 1731363552, + "lastModified": 1732021966, "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0", + "rev": "3308484d1a443fc5bc92012435d79e80458fe43c", "type": "github" }, "original": { From 1aa9a3ef5f46861f0fb6f79be701443299307f98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Mon, 2 Dec 2024 15:18:36 +0000 Subject: [PATCH 22/28] bump dotnet sdk --- src/modules/languages/dotnet.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/languages/dotnet.nix b/src/modules/languages/dotnet.nix index 81b6bb3bc..c52f2b465 100644 --- a/src/modules/languages/dotnet.nix +++ b/src/modules/languages/dotnet.nix @@ -9,7 +9,7 @@ in package = lib.mkOption { type = lib.types.package; - default = pkgs.dotnetCorePackages.sdk_7_0; + default = pkgs.dotnetCorePackages.sdk_8_0; defaultText = lib.literalExpression "pkgs.dotnet-sdk"; description = "The .NET SDK package to use."; }; From ace5b1d3919550451ca267deb8ab0a63f8e18b2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Mon, 2 Dec 2024 15:20:18 +0000 Subject: [PATCH 23/28] bump nixpkgs --- devenv.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/devenv.lock b/devenv.lock index 92684dd07..d82058974 100644 --- a/devenv.lock +++ b/devenv.lock @@ -191,10 +191,10 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1732749044, + "lastModified": 1733016324, "owner": "NixOS", "repo": "nixpkgs", - "rev": "0c5b4ecbed5b155b705336aa96d878e55acd8685", + "rev": "7e1ca67996afd8233d9033edd26e442836cc2ad6", "type": "github" }, "original": { @@ -206,10 +206,10 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1732780316, + "lastModified": 1733152427, "owner": "cachix", "repo": "devenv-nixpkgs", - "rev": "226216574ada4c3ecefcbbec41f39ce4655f78ef", + "rev": "e6944db042eb6a652debbff44dd41b44575ce1a8", "type": "github" }, "original": { From 6525363a8829a84e645221f78eb49667ac838f46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Mon, 2 Dec 2024 22:49:36 +0000 Subject: [PATCH 24/28] erlang: bump to 27 to fix gleam --- src/modules/languages/erlang.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/languages/erlang.nix b/src/modules/languages/erlang.nix index 3112f46f6..bee8bc1f1 100644 --- a/src/modules/languages/erlang.nix +++ b/src/modules/languages/erlang.nix @@ -10,7 +10,7 @@ in package = lib.mkOption { type = lib.types.package; description = "Which package of Erlang to use."; - default = pkgs.erlang; + default = pkgs.erlang_27; defaultText = lib.literalExpression "pkgs.erlang"; }; }; From 27f04cf696cf863a8b5f50d225a1ae16072c463f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Mon, 2 Dec 2024 22:51:17 +0000 Subject: [PATCH 25/28] timescale: fix build by allowing unfree --- examples/postgres-timescale/devenv.yaml | 1 + 1 file changed, 1 insertion(+) create mode 100644 examples/postgres-timescale/devenv.yaml diff --git a/examples/postgres-timescale/devenv.yaml b/examples/postgres-timescale/devenv.yaml new file mode 100644 index 000000000..09bce897b --- /dev/null +++ b/examples/postgres-timescale/devenv.yaml @@ -0,0 +1 @@ +allowUnfree: true From 994091fd86a4c6bdc4b76f9e129a4ba7d16850dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Mon, 2 Dec 2024 22:52:49 +0000 Subject: [PATCH 26/28] opentelemetry-collector: ttl_days -> ttl --- examples/opentelemetry-collector/devenv.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/opentelemetry-collector/devenv.nix b/examples/opentelemetry-collector/devenv.nix index 9a28500c0..1bebf157b 100644 --- a/examples/opentelemetry-collector/devenv.nix +++ b/examples/opentelemetry-collector/devenv.nix @@ -34,7 +34,7 @@ clickhouse = { endpoint = "tcp://127.0.0.1:9000?dial_timeout=10s&compress=lz4"; database = "otel"; - ttl_days = 3; + ttl = "72h"; logs_table_name = "otel_logs"; traces_table_name = "otel_traces"; metrics_table_name = "otel_metrics"; From bc0b62b35dfed94044cf5b842e7c5874eb4e92ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Tue, 3 Dec 2024 14:38:08 +0000 Subject: [PATCH 27/28] bump nixpkgs --- devenv.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/devenv.lock b/devenv.lock index d82058974..c054947d8 100644 --- a/devenv.lock +++ b/devenv.lock @@ -146,10 +146,10 @@ }, "nixpkgs": { "locked": { - "lastModified": 1732887538, + "lastModified": 1733220138, "owner": "NixOS", "repo": "nixpkgs", - "rev": "2e212b2e1fad641d3721f8b1b530747ff4287905", + "rev": "bcb68885668cccec12276bbb379f8f2557aa06ce", "type": "github" }, "original": { @@ -206,10 +206,10 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1733152427, + "lastModified": 1733236341, "owner": "cachix", "repo": "devenv-nixpkgs", - "rev": "e6944db042eb6a652debbff44dd41b44575ce1a8", + "rev": "f58592aed5d20daa49c1441604d7e7d501645541", "type": "github" }, "original": { From b4e173adb0743db9ec7b8c16a3b07e59ab4c09d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Tue, 3 Dec 2024 14:38:39 +0000 Subject: [PATCH 28/28] poetry: now requires zlib --- examples/python-poetry/devenv.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/examples/python-poetry/devenv.nix b/examples/python-poetry/devenv.nix index 3cd17756c..fd59cd438 100644 --- a/examples/python-poetry/devenv.nix +++ b/examples/python-poetry/devenv.nix @@ -4,6 +4,7 @@ packages = [ # A python dependency outside of poetry. config.languages.python.package.pkgs.pjsua2 + pkgs.zlib ]; languages.python = {