diff --git a/flake.lock b/flake.lock index b3e5b48..91010c6 100644 --- a/flake.lock +++ b/flake.lock @@ -2,108 +2,28 @@ "nodes": { "cachix": { "inputs": { - "devenv": "devenv_2", + "devenv": [ + "devenv" + ], "flake-compat": [ - "devenv", - "flake-compat" + "devenv" ], "git-hooks": [ - "devenv", - "pre-commit-hooks" + "devenv" ], - "nixpkgs": [ - "devenv", - "nixpkgs" - ] + "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1728113491, - "narHash": "sha256-L1C2Mo4sZfvk6Bq2z3VARudEI00gWMg7d1SIijvR0wk=", + "lastModified": 1742042642, + "narHash": "sha256-D0gP8srrX0qj+wNYNPdtVJsQuFzIng3q43thnHXQ/es=", "owner": "cachix", "repo": "cachix", - "rev": "b8d4825e49372937e4e377bc4eef023301497a66", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "cachix", - "type": "github" - } - }, - "cachix_2": { - "inputs": { - "devenv": "devenv_3", - "flake-compat": [ - "devenv", - "cachix", - "devenv", - "flake-compat" - ], - "git-hooks": [ - "devenv", - "cachix", - "devenv", - "pre-commit-hooks" - ], - "nixpkgs": [ - "devenv", - "cachix", - "devenv", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1726520618, - "narHash": "sha256-jOsaBmJ/EtX5t/vbylCdS7pWYcKGmWOKg4QKUzKr6dA=", - "owner": "cachix", - "repo": "cachix", - "rev": "695525f9086542dfb09fde0871dbf4174abbf634", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "cachix", - "type": "github" - } - }, - "cachix_3": { - "inputs": { - "devenv": "devenv_4", - "flake-compat": [ - "devenv", - "cachix", - "devenv", - "cachix", - "devenv", - "flake-compat" - ], - "nixpkgs": [ - "devenv", - "cachix", - "devenv", - "cachix", - "devenv", - "nixpkgs" - ], - "pre-commit-hooks": [ - "devenv", - "cachix", - "devenv", - "cachix", - "devenv", - "pre-commit-hooks" - ] - }, - "locked": { - "lastModified": 1712055811, - "narHash": "sha256-7FcfMm5A/f02yyzuavJe06zLa9hcMHsagE28ADcmQvk=", - "owner": "cachix", - "repo": "cachix", - "rev": "02e38da89851ec7fec3356a5c04bc8349cae0e30", + "rev": "a624d3eaf4b1d225f918de8543ed739f2f574203", "type": "github" }, "original": { "owner": "cachix", + "ref": "latest", "repo": "cachix", "type": "github" } @@ -111,134 +31,21 @@ "devenv": { "inputs": { "cachix": "cachix", - "flake-compat": "flake-compat_2", - "nix": "nix_4", - "nixpkgs": "nixpkgs_4", - "pre-commit-hooks": "pre-commit-hooks_3" - }, - "locked": { - "lastModified": 1728573431, - "narHash": "sha256-p37PxnHGgm6dfuYpYr4iV2AV+U5F44CAK8QAP4kkSxM=", - "owner": "cachix", - "repo": "devenv", - "rev": "151a82a27c8565774452d02c63d1a35c39563919", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "devenv", - "type": "github" - } - }, - "devenv_2": { - "inputs": { - "cachix": "cachix_2", - "flake-compat": [ - "devenv", - "cachix", - "flake-compat" - ], - "nix": "nix_3", - "nixpkgs": [ - "devenv", - "cachix", - "nixpkgs" - ], - "pre-commit-hooks": [ - "devenv", - "cachix", - "git-hooks" - ] - }, - "locked": { - "lastModified": 1727963652, - "narHash": "sha256-os0EDjn7QVXL6RtHNb9TrZLXVm2Tc5/nZKk3KpbTzd8=", - "owner": "cachix", - "repo": "devenv", - "rev": "cb0052e25dbcc8267b3026160dc73cddaac7d5fd", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "devenv", - "type": "github" - } - }, - "devenv_3": { - "inputs": { - "cachix": "cachix_3", - "flake-compat": [ - "devenv", - "cachix", - "devenv", - "cachix", - "flake-compat" - ], - "nix": "nix_2", - "nixpkgs": [ - "devenv", - "cachix", - "devenv", - "cachix", - "nixpkgs" - ], - "pre-commit-hooks": [ - "devenv", - "cachix", - "devenv", - "cachix", - "git-hooks" - ] - }, - "locked": { - "lastModified": 1723156315, - "narHash": "sha256-0JrfahRMJ37Rf1i0iOOn+8Z4CLvbcGNwa2ChOAVrp/8=", - "owner": "cachix", - "repo": "devenv", - "rev": "ff5eb4f2accbcda963af67f1a1159e3f6c7f5f91", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "devenv", - "type": "github" - } - }, - "devenv_4": { - "inputs": { - "flake-compat": [ - "devenv", - "cachix", - "devenv", - "cachix", - "devenv", - "cachix", - "flake-compat" - ], + "flake-compat": "flake-compat", + "git-hooks": "git-hooks", "nix": "nix", - "nixpkgs": "nixpkgs", - "poetry2nix": "poetry2nix", - "pre-commit-hooks": [ - "devenv", - "cachix", - "devenv", - "cachix", - "devenv", - "cachix", - "pre-commit-hooks" - ] + "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1708704632, - "narHash": "sha256-w+dOIW60FKMaHI1q5714CSibk99JfYxm0CzTinYWr+Q=", + "lastModified": 1743783972, + "narHash": "sha256-5wPsNCnWmeLpLxavsftA9L7tnYgtlexV7FwLegxtpy4=", "owner": "cachix", "repo": "devenv", - "rev": "2ee4450b0f4b95a1b90f2eb5ffea98b90e48c196", + "rev": "2f53e2f867e0c2ba18b880e66169366e5f8ca554", "type": "github" }, "original": { "owner": "cachix", - "ref": "python-rewrite", "repo": "devenv", "type": "github" } @@ -246,27 +53,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "lastModified": 1733328505, + "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", "owner": "edolstra", "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_2": { - "flake": false, - "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", "type": "github" }, "original": { @@ -278,8 +69,6 @@ "flake-parts": { "inputs": { "nixpkgs-lib": [ - "devenv", - "cachix", "devenv", "nix", "nixpkgs" @@ -299,80 +88,10 @@ "type": "github" } }, - "flake-parts_2": { - "inputs": { - "nixpkgs-lib": [ - "devenv", - "nix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1727826117, - "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, "flake-utils": { "inputs": { "systems": "systems" }, - "locked": { - "lastModified": 1689068808, - "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_2": { - "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_3": { - "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_4": { - "inputs": { - "systems": "systems_2" - }, "locked": { "lastModified": 1694529238, "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", @@ -387,20 +106,45 @@ "type": "github" } }, - "gitignore": { + "git-hooks": { "inputs": { + "flake-compat": [ + "devenv" + ], + "gitignore": "gitignore", "nixpkgs": [ "devenv", - "pre-commit-hooks", "nixpkgs" ] }, "locked": { - "lastModified": 1660459072, - "narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=", + "lastModified": 1742649964, + "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, + "gitignore": { + "inputs": { + "nixpkgs": [ + "devenv", + "git-hooks", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1709087332, + "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", "owner": "hercules-ci", "repo": "gitignore.nix", - "rev": "a20de23b925fd8264fd7fad6454652e142fd7f73", + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", "type": "github" }, "original": { @@ -411,17 +155,17 @@ }, "gomod2nix": { "inputs": { - "flake-utils": "flake-utils_4", + "flake-utils": "flake-utils", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1705314449, - "narHash": "sha256-yfQQ67dLejP0FLK76LKHbkzcQqNIrux6MFe32MMFGNQ=", + "lastModified": 1742209644, + "narHash": "sha256-jMy1XqXqD0/tJprEbUmKilTkvbDY/C0ZGSsJJH4TNCE=", "owner": "nix-community", "repo": "gomod2nix", - "rev": "30e3c3a9ec4ac8453282ca7f67fca9e1da12c3e6", + "rev": "8f3534eb8f6c5c3fce799376dc3b91bae6b11884", "type": "github" }, "original": { @@ -446,164 +190,30 @@ "type": "github" } }, - "libgit2_2": { - "flake": false, - "locked": { - "lastModified": 1728334903, - "narHash": "sha256-PhX0Rve0//Ue0WP2XLJkjmrpiMRHQNgmwffyTXx+zHk=", - "owner": "libgit2", - "repo": "libgit2", - "rev": "0da8e725f1ebacd8093aefe966e25ba71c3d995c", - "type": "github" - }, - "original": { - "owner": "libgit2", - "repo": "libgit2", - "type": "github" - } - }, "nix": { - "inputs": { - "flake-compat": "flake-compat", - "nixpkgs": [ - "devenv", - "cachix", - "devenv", - "cachix", - "devenv", - "cachix", - "devenv", - "nixpkgs" - ], - "nixpkgs-regression": "nixpkgs-regression" - }, - "locked": { - "lastModified": 1712911606, - "narHash": "sha256-BGvBhepCufsjcUkXnEEXhEVjwdJAwPglCC2+bInc794=", - "owner": "domenkozar", - "repo": "nix", - "rev": "b24a9318ea3f3600c1e24b4a00691ee912d4de12", - "type": "github" - }, - "original": { - "owner": "domenkozar", - "ref": "devenv-2.21", - "repo": "nix", - "type": "github" - } - }, - "nix-github-actions": { - "inputs": { - "nixpkgs": [ - "devenv", - "cachix", - "devenv", - "cachix", - "devenv", - "cachix", - "devenv", - "poetry2nix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1688870561, - "narHash": "sha256-4UYkifnPEw1nAzqqPOTL2MvWtm3sNGw1UTYTalkTcGY=", - "owner": "nix-community", - "repo": "nix-github-actions", - "rev": "165b1650b753316aa7f1787f3005a8d2da0f5301", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nix-github-actions", - "type": "github" - } - }, - "nix_2": { "inputs": { "flake-compat": [ - "devenv", - "cachix", - "devenv", - "cachix", - "devenv", - "flake-compat" - ], - "nixpkgs": [ - "devenv", - "cachix", - "devenv", - "cachix", - "devenv", - "nixpkgs" - ], - "nixpkgs-regression": "nixpkgs-regression_2" - }, - "locked": { - "lastModified": 1712911606, - "narHash": "sha256-BGvBhepCufsjcUkXnEEXhEVjwdJAwPglCC2+bInc794=", - "owner": "domenkozar", - "repo": "nix", - "rev": "b24a9318ea3f3600c1e24b4a00691ee912d4de12", - "type": "github" - }, - "original": { - "owner": "domenkozar", - "ref": "devenv-2.21", - "repo": "nix", - "type": "github" - } - }, - "nix_3": { - "inputs": { - "flake-compat": [ - "devenv", - "cachix", - "devenv", - "flake-compat" + "devenv" ], "flake-parts": "flake-parts", "libgit2": "libgit2", "nixpkgs": "nixpkgs_2", - "nixpkgs-23-11": "nixpkgs-23-11", - "nixpkgs-regression": "nixpkgs-regression_3", - "pre-commit-hooks": "pre-commit-hooks" - }, - "locked": { - "lastModified": 1727438425, - "narHash": "sha256-X8ES7I1cfNhR9oKp06F6ir4Np70WGZU5sfCOuNBEwMg=", - "owner": "domenkozar", - "repo": "nix", - "rev": "f6c5ae4c1b2e411e6b1e6a8181cc84363d6a7546", - "type": "github" - }, - "original": { - "owner": "domenkozar", - "ref": "devenv-2.24", - "repo": "nix", - "type": "github" - } - }, - "nix_4": { - "inputs": { - "flake-compat": [ - "devenv", - "flake-compat" + "nixpkgs-23-11": [ + "devenv" ], - "flake-parts": "flake-parts_2", - "libgit2": "libgit2_2", - "nixpkgs": "nixpkgs_3", - "nixpkgs-23-11": "nixpkgs-23-11_2", - "nixpkgs-regression": "nixpkgs-regression_4", - "pre-commit-hooks": "pre-commit-hooks_2" + "nixpkgs-regression": [ + "devenv" + ], + "pre-commit-hooks": [ + "devenv" + ] }, "locked": { - "lastModified": 1727438425, - "narHash": "sha256-X8ES7I1cfNhR9oKp06F6ir4Np70WGZU5sfCOuNBEwMg=", + "lastModified": 1741798497, + "narHash": "sha256-E3j+3MoY8Y96mG1dUIiLFm2tZmNbRvSiyN7CrSKuAVg=", "owner": "domenkozar", "repo": "nix", - "rev": "f6c5ae4c1b2e411e6b1e6a8181cc84363d6a7546", + "rev": "f3f44b2baaf6c4c6e179de8cbb1cc6db031083cd", "type": "github" }, "original": { @@ -615,128 +225,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1692808169, - "narHash": "sha256-x9Opq06rIiwdwGeK2Ykj69dNc2IvUH1fY55Wm7atwrE=", + "lastModified": 1733212471, + "narHash": "sha256-M1+uCoV5igihRfcUKrr1riygbe73/dzNnzPsmaLCmpo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9201b5ff357e781bf014d0330d18555695df7ba8", + "rev": "55d15ad12a74eb7d4646254e13638ad0c4128776", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-23-11": { - "locked": { - "lastModified": 1717159533, - "narHash": "sha256-oamiKNfr2MS6yH64rUn99mIZjc45nGJlj9eGth/3Xuw=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "a62e6edd6d5e1fa0329b8653c801147986f8d446", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "a62e6edd6d5e1fa0329b8653c801147986f8d446", - "type": "github" - } - }, - "nixpkgs-23-11_2": { - "locked": { - "lastModified": 1717159533, - "narHash": "sha256-oamiKNfr2MS6yH64rUn99mIZjc45nGJlj9eGth/3Xuw=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "a62e6edd6d5e1fa0329b8653c801147986f8d446", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "a62e6edd6d5e1fa0329b8653c801147986f8d446", - "type": "github" - } - }, - "nixpkgs-regression": { - "locked": { - "lastModified": 1643052045, - "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", - "type": "github" - } - }, - "nixpkgs-regression_2": { - "locked": { - "lastModified": 1643052045, - "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", - "type": "github" - } - }, - "nixpkgs-regression_3": { - "locked": { - "lastModified": 1643052045, - "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", - "type": "github" - } - }, - "nixpkgs-regression_4": { - "locked": { - "lastModified": 1643052045, - "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", - "type": "github" - } - }, - "nixpkgs-stable": { - "locked": { - "lastModified": 1678872516, - "narHash": "sha256-/E1YwtMtFAu2KUQKV/1+KFuReYPANM2Rzehk84VxVoc=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "9b8e5abb18324c7fe9f07cb100c3cd4a29cda8b8", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-22.11", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -759,27 +257,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1728573531, - "narHash": "sha256-WYerSn61NRVGaWlJaprHWDU9rGgMJVXlYZ+kmHB/gC8=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "1dfc201544fed6086383b4477d8d5c30055215c7", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "release-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { - "locked": { - "lastModified": 1716977621, - "narHash": "sha256-Q1UQzYcMJH4RscmpTkjlgqQDX5yi1tZL0O345Ri6vXQ=", + "lastModified": 1733477122, + "narHash": "sha256-qamMCz5mNpQmgBwc8SB5tVMlD5sbwVIToVZtSxMph9s=", "owner": "cachix", "repo": "devenv-nixpkgs", - "rev": "4267e705586473d3e5c8d50299e71503f16a6fb6", + "rev": "7bd9e84d0452f6d2e63b6e6da29fe73fac951857", "type": "github" }, "original": { @@ -789,13 +271,13 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_4": { "locked": { - "lastModified": 1728538411, - "narHash": "sha256-f0SBJz1eZ2yOuKUr5CA9BHULGXVSn6miBuUWdTyhUhU=", + "lastModified": 1743938762, + "narHash": "sha256-UgFYn8sGv9B8PoFpUfCa43CjMZBl1x/ShQhRDHBFQdI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b69de56fac8c2b6f8fd27f2eca01dcda8e0a4221", + "rev": "74a40410369a1c35ee09b8a1abee6f4acbedc059", "type": "github" }, "original": { @@ -805,148 +287,12 @@ "type": "github" } }, - "poetry2nix": { - "inputs": { - "flake-utils": "flake-utils", - "nix-github-actions": "nix-github-actions", - "nixpkgs": [ - "devenv", - "cachix", - "devenv", - "cachix", - "devenv", - "cachix", - "devenv", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1692876271, - "narHash": "sha256-IXfZEkI0Mal5y1jr6IRWMqK8GW2/f28xJenZIPQqkY0=", - "owner": "nix-community", - "repo": "poetry2nix", - "rev": "d5006be9c2c2417dafb2e2e5034d83fabd207ee3", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "poetry2nix", - "type": "github" - } - }, - "pre-commit-hooks": { - "inputs": { - "flake-compat": [ - "devenv", - "cachix", - "devenv", - "nix" - ], - "flake-utils": "flake-utils_2", - "gitignore": [ - "devenv", - "cachix", - "devenv", - "nix" - ], - "nixpkgs": [ - "devenv", - "cachix", - "devenv", - "nix", - "nixpkgs" - ], - "nixpkgs-stable": [ - "devenv", - "cachix", - "devenv", - "nix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1712897695, - "narHash": "sha256-nMirxrGteNAl9sWiOhoN5tIHyjBbVi5e2tgZUgZlK3Y=", - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "rev": "40e6053ecb65fcbf12863338a6dcefb3f55f1bf8", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "type": "github" - } - }, - "pre-commit-hooks_2": { - "inputs": { - "flake-compat": [ - "devenv", - "nix" - ], - "gitignore": [ - "devenv", - "nix" - ], - "nixpkgs": [ - "devenv", - "nix", - "nixpkgs" - ], - "nixpkgs-stable": [ - "devenv", - "nix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1728580416, - "narHash": "sha256-nKttjKg6lE7O5S+wlBOkXsUGdOgVxZ8SWaCOyodW5so=", - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "rev": "4ebefcac44b5116cf5741be858245db769ddedd1", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "type": "github" - } - }, - "pre-commit-hooks_3": { - "inputs": { - "flake-compat": [ - "devenv", - "flake-compat" - ], - "flake-utils": "flake-utils_3", - "gitignore": "gitignore", - "nixpkgs": [ - "devenv", - "nixpkgs" - ], - "nixpkgs-stable": "nixpkgs-stable" - }, - "locked": { - "lastModified": 1686050334, - "narHash": "sha256-R0mczWjDzBpIvM3XXhO908X5e2CQqjyh/gFbwZk/7/Q=", - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "rev": "6881eb2ae5d8a3516e34714e7a90d9d95914c4dc", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "type": "github" - } - }, "root": { "inputs": { "devenv": "devenv", "gomod2nix": "gomod2nix", - "nixpkgs": "nixpkgs_5", - "systems": "systems_3" + "nixpkgs": "nixpkgs_4", + "systems": "systems_2" } }, "systems": { @@ -978,21 +324,6 @@ "repo": "default", "type": "github" } - }, - "systems_3": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } } }, "root": "root", diff --git a/go.mod b/go.mod index fb6fbba..514869c 100644 --- a/go.mod +++ b/go.mod @@ -1,7 +1,5 @@ module github.com/acaloiaro/ess -go 1.21 +go 1.24 -replace github.com/hashicorp/go-envparse v0.1.0 => github.com/acaloiaro/go-envparse v0.3.0 - -require github.com/hashicorp/go-envparse v0.1.0 +require github.com/acaloiaro/go-envparse v0.5.0 diff --git a/go.sum b/go.sum index 98f7b7a..7feba46 100644 --- a/go.sum +++ b/go.sum @@ -1,2 +1,2 @@ -github.com/acaloiaro/go-envparse v0.3.0 h1:TGHMQ6VK8ABhqalxaRTU2gj75dCDorQq6YTxGVI5X+4= -github.com/acaloiaro/go-envparse v0.3.0/go.mod h1:OHheN1GoygLlAkTlXLXvAdnXdZxy8JUweQ1rAXx1xnc= +github.com/acaloiaro/go-envparse v0.5.0 h1:95eVI3jHOvzgMAZCOJ7Q2gLe2bHAD3ymoAqmOuBkKUo= +github.com/acaloiaro/go-envparse v0.5.0/go.mod h1:X5ITubhnuE9s+hj1eDuOXTniHEClvAm87hvxfF6mShw= diff --git a/gomod2nix.toml b/gomod2nix.toml index bb19660..cc851af 100644 --- a/gomod2nix.toml +++ b/gomod2nix.toml @@ -1,7 +1,6 @@ schema = 3 [mod] - [mod."github.com/hashicorp/go-envparse"] - version = "v0.3.0" - hash = "sha256-pbffSgC8BDtvkQAyI6ILkrMleI8m2JtedV0PL64Ok3I=" - replaced = "github.com/acaloiaro/go-envparse" + [mod."github.com/acaloiaro/go-envparse"] + version = "v0.5.0" + hash = "sha256-ptmJ08G0/rn1yCsDxT5fvkTpMZ1KJRCiOp7pHhdR9dE=" diff --git a/main.go b/main.go index 5d0425c..6675878 100644 --- a/main.go +++ b/main.go @@ -15,7 +15,7 @@ import ( "strings" "text/template" - "github.com/hashicorp/go-envparse" + "github.com/acaloiaro/go-envparse" ) const VERSION = "2.14.1" diff --git a/vendor/github.com/acaloiaro/go-envparse/.envrc b/vendor/github.com/acaloiaro/go-envparse/.envrc new file mode 100644 index 0000000..ddabc71 --- /dev/null +++ b/vendor/github.com/acaloiaro/go-envparse/.envrc @@ -0,0 +1,13 @@ +if ! has nix_direnv_version || ! nix_direnv_version 2.2.1; then + source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/2.2.1/direnvrc" "sha256-zelF0vLbEl5uaqrfIzbgNzJWGmLzCmYAkInj/LNxvKs=" +fi + +watch_file flake.nix +watch_file flake.lock +watch_file go.lock + +if ! use flake . --impure +then + echo "devenv could not be built. The devenv environment was not loaded." >&2 +fi + diff --git a/vendor/github.com/acaloiaro/go-envparse/.gitignore b/vendor/github.com/acaloiaro/go-envparse/.gitignore new file mode 100644 index 0000000..6c7d353 --- /dev/null +++ b/vendor/github.com/acaloiaro/go-envparse/.gitignore @@ -0,0 +1,2 @@ +.direnv +.devenv diff --git a/vendor/github.com/acaloiaro/go-envparse/.goreleaser.yml b/vendor/github.com/acaloiaro/go-envparse/.goreleaser.yml new file mode 100644 index 0000000..ab383dd --- /dev/null +++ b/vendor/github.com/acaloiaro/go-envparse/.goreleaser.yml @@ -0,0 +1,3 @@ +version: 2 +builds: + - skip: true diff --git a/vendor/github.com/acaloiaro/go-envparse/LICENSE b/vendor/github.com/acaloiaro/go-envparse/LICENSE new file mode 100644 index 0000000..b9ac071 --- /dev/null +++ b/vendor/github.com/acaloiaro/go-envparse/LICENSE @@ -0,0 +1,375 @@ +Copyright (c) 2017 HashiCorp, Inc. + +Mozilla Public License Version 2.0 +================================== + +1. Definitions +-------------- + +1.1. "Contributor" + means each individual or legal entity that creates, contributes to + the creation of, or owns Covered Software. + +1.2. "Contributor Version" + means the combination of the Contributions of others (if any) used + by a Contributor and that particular Contributor's Contribution. + +1.3. "Contribution" + means Covered Software of a particular Contributor. + +1.4. "Covered Software" + means Source Code Form to which the initial Contributor has attached + the notice in Exhibit A, the Executable Form of such Source Code + Form, and Modifications of such Source Code Form, in each case + including portions thereof. + +1.5. "Incompatible With Secondary Licenses" + means + + (a) that the initial Contributor has attached the notice described + in Exhibit B to the Covered Software; or + + (b) that the Covered Software was made available under the terms of + version 1.1 or earlier of the License, but not also under the + terms of a Secondary License. + +1.6. "Executable Form" + means any form of the work other than Source Code Form. + +1.7. "Larger Work" + means a work that combines Covered Software with other material, in + a separate file or files, that is not Covered Software. + +1.8. "License" + means this document. + +1.9. "Licensable" + means having the right to grant, to the maximum extent possible, + whether at the time of the initial grant or subsequently, any and + all of the rights conveyed by this License. + +1.10. "Modifications" + means any of the following: + + (a) any file in Source Code Form that results from an addition to, + deletion from, or modification of the contents of Covered + Software; or + + (b) any new file in Source Code Form that contains any Covered + Software. + +1.11. "Patent Claims" of a Contributor + means any patent claim(s), including without limitation, method, + process, and apparatus claims, in any patent Licensable by such + Contributor that would be infringed, but for the grant of the + License, by the making, using, selling, offering for sale, having + made, import, or transfer of either its Contributions or its + Contributor Version. + +1.12. "Secondary License" + means either the GNU General Public License, Version 2.0, the GNU + Lesser General Public License, Version 2.1, the GNU Affero General + Public License, Version 3.0, or any later versions of those + licenses. + +1.13. "Source Code Form" + means the form of the work preferred for making modifications. + +1.14. "You" (or "Your") + means an individual or a legal entity exercising rights under this + License. For legal entities, "You" includes any entity that + controls, is controlled by, or is under common control with You. For + purposes of this definition, "control" means (a) the power, direct + or indirect, to cause the direction or management of such entity, + whether by contract or otherwise, or (b) ownership of more than + fifty percent (50%) of the outstanding shares or beneficial + ownership of such entity. + +2. License Grants and Conditions +-------------------------------- + +2.1. Grants + +Each Contributor hereby grants You a world-wide, royalty-free, +non-exclusive license: + +(a) under intellectual property rights (other than patent or trademark) + Licensable by such Contributor to use, reproduce, make available, + modify, display, perform, distribute, and otherwise exploit its + Contributions, either on an unmodified basis, with Modifications, or + as part of a Larger Work; and + +(b) under Patent Claims of such Contributor to make, use, sell, offer + for sale, have made, import, and otherwise transfer either its + Contributions or its Contributor Version. + +2.2. Effective Date + +The licenses granted in Section 2.1 with respect to any Contribution +become effective for each Contribution on the date the Contributor first +distributes such Contribution. + +2.3. Limitations on Grant Scope + +The licenses granted in this Section 2 are the only rights granted under +this License. No additional rights or licenses will be implied from the +distribution or licensing of Covered Software under this License. +Notwithstanding Section 2.1(b) above, no patent license is granted by a +Contributor: + +(a) for any code that a Contributor has removed from Covered Software; + or + +(b) for infringements caused by: (i) Your and any other third party's + modifications of Covered Software, or (ii) the combination of its + Contributions with other software (except as part of its Contributor + Version); or + +(c) under Patent Claims infringed by Covered Software in the absence of + its Contributions. + +This License does not grant any rights in the trademarks, service marks, +or logos of any Contributor (except as may be necessary to comply with +the notice requirements in Section 3.4). + +2.4. Subsequent Licenses + +No Contributor makes additional grants as a result of Your choice to +distribute the Covered Software under a subsequent version of this +License (see Section 10.2) or under the terms of a Secondary License (if +permitted under the terms of Section 3.3). + +2.5. Representation + +Each Contributor represents that the Contributor believes its +Contributions are its original creation(s) or it has sufficient rights +to grant the rights to its Contributions conveyed by this License. + +2.6. Fair Use + +This License is not intended to limit any rights You have under +applicable copyright doctrines of fair use, fair dealing, or other +equivalents. + +2.7. Conditions + +Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted +in Section 2.1. + +3. Responsibilities +------------------- + +3.1. Distribution of Source Form + +All distribution of Covered Software in Source Code Form, including any +Modifications that You create or to which You contribute, must be under +the terms of this License. You must inform recipients that the Source +Code Form of the Covered Software is governed by the terms of this +License, and how they can obtain a copy of this License. You may not +attempt to alter or restrict the recipients' rights in the Source Code +Form. + +3.2. Distribution of Executable Form + +If You distribute Covered Software in Executable Form then: + +(a) such Covered Software must also be made available in Source Code + Form, as described in Section 3.1, and You must inform recipients of + the Executable Form how they can obtain a copy of such Source Code + Form by reasonable means in a timely manner, at a charge no more + than the cost of distribution to the recipient; and + +(b) You may distribute such Executable Form under the terms of this + License, or sublicense it under different terms, provided that the + license for the Executable Form does not attempt to limit or alter + the recipients' rights in the Source Code Form under this License. + +3.3. Distribution of a Larger Work + +You may create and distribute a Larger Work under terms of Your choice, +provided that You also comply with the requirements of this License for +the Covered Software. If the Larger Work is a combination of Covered +Software with a work governed by one or more Secondary Licenses, and the +Covered Software is not Incompatible With Secondary Licenses, this +License permits You to additionally distribute such Covered Software +under the terms of such Secondary License(s), so that the recipient of +the Larger Work may, at their option, further distribute the Covered +Software under the terms of either this License or such Secondary +License(s). + +3.4. Notices + +You may not remove or alter the substance of any license notices +(including copyright notices, patent notices, disclaimers of warranty, +or limitations of liability) contained within the Source Code Form of +the Covered Software, except that You may alter any license notices to +the extent required to remedy known factual inaccuracies. + +3.5. Application of Additional Terms + +You may choose to offer, and to charge a fee for, warranty, support, +indemnity or liability obligations to one or more recipients of Covered +Software. However, You may do so only on Your own behalf, and not on +behalf of any Contributor. You must make it absolutely clear that any +such warranty, support, indemnity, or liability obligation is offered by +You alone, and You hereby agree to indemnify every Contributor for any +liability incurred by such Contributor as a result of warranty, support, +indemnity or liability terms You offer. You may include additional +disclaimers of warranty and limitations of liability specific to any +jurisdiction. + +4. Inability to Comply Due to Statute or Regulation +--------------------------------------------------- + +If it is impossible for You to comply with any of the terms of this +License with respect to some or all of the Covered Software due to +statute, judicial order, or regulation then You must: (a) comply with +the terms of this License to the maximum extent possible; and (b) +describe the limitations and the code they affect. Such description must +be placed in a text file included with all distributions of the Covered +Software under this License. Except to the extent prohibited by statute +or regulation, such description must be sufficiently detailed for a +recipient of ordinary skill to be able to understand it. + +5. Termination +-------------- + +5.1. The rights granted under this License will terminate automatically +if You fail to comply with any of its terms. However, if You become +compliant, then the rights granted under this License from a particular +Contributor are reinstated (a) provisionally, unless and until such +Contributor explicitly and finally terminates Your grants, and (b) on an +ongoing basis, if such Contributor fails to notify You of the +non-compliance by some reasonable means prior to 60 days after You have +come back into compliance. Moreover, Your grants from a particular +Contributor are reinstated on an ongoing basis if such Contributor +notifies You of the non-compliance by some reasonable means, this is the +first time You have received notice of non-compliance with this License +from such Contributor, and You become compliant prior to 30 days after +Your receipt of the notice. + +5.2. If You initiate litigation against any entity by asserting a patent +infringement claim (excluding declaratory judgment actions, +counter-claims, and cross-claims) alleging that a Contributor Version +directly or indirectly infringes any patent, then the rights granted to +You by any and all Contributors for the Covered Software under Section +2.1 of this License shall terminate. + +5.3. In the event of termination under Sections 5.1 or 5.2 above, all +end user license agreements (excluding distributors and resellers) which +have been validly granted by You or Your distributors under this License +prior to termination shall survive termination. + +************************************************************************ +* * +* 6. Disclaimer of Warranty * +* ------------------------- * +* * +* Covered Software is provided under this License on an "as is" * +* basis, without warranty of any kind, either expressed, implied, or * +* statutory, including, without limitation, warranties that the * +* Covered Software is free of defects, merchantable, fit for a * +* particular purpose or non-infringing. The entire risk as to the * +* quality and performance of the Covered Software is with You. * +* Should any Covered Software prove defective in any respect, You * +* (not any Contributor) assume the cost of any necessary servicing, * +* repair, or correction. This disclaimer of warranty constitutes an * +* essential part of this License. No use of any Covered Software is * +* authorized under this License except under this disclaimer. * +* * +************************************************************************ + +************************************************************************ +* * +* 7. Limitation of Liability * +* -------------------------- * +* * +* Under no circumstances and under no legal theory, whether tort * +* (including negligence), contract, or otherwise, shall any * +* Contributor, or anyone who distributes Covered Software as * +* permitted above, be liable to You for any direct, indirect, * +* special, incidental, or consequential damages of any character * +* including, without limitation, damages for lost profits, loss of * +* goodwill, work stoppage, computer failure or malfunction, or any * +* and all other commercial damages or losses, even if such party * +* shall have been informed of the possibility of such damages. This * +* limitation of liability shall not apply to liability for death or * +* personal injury resulting from such party's negligence to the * +* extent applicable law prohibits such limitation. Some * +* jurisdictions do not allow the exclusion or limitation of * +* incidental or consequential damages, so this exclusion and * +* limitation may not apply to You. * +* * +************************************************************************ + +8. Litigation +------------- + +Any litigation relating to this License may be brought only in the +courts of a jurisdiction where the defendant maintains its principal +place of business and such litigation shall be governed by laws of that +jurisdiction, without reference to its conflict-of-law provisions. +Nothing in this Section shall prevent a party's ability to bring +cross-claims or counter-claims. + +9. Miscellaneous +---------------- + +This License represents the complete agreement concerning the subject +matter hereof. If any provision of this License is held to be +unenforceable, such provision shall be reformed only to the extent +necessary to make it enforceable. Any law or regulation which provides +that the language of a contract shall be construed against the drafter +shall not be used to construe this License against a Contributor. + +10. Versions of the License +--------------------------- + +10.1. New Versions + +Mozilla Foundation is the license steward. Except as provided in Section +10.3, no one other than the license steward has the right to modify or +publish new versions of this License. Each version will be given a +distinguishing version number. + +10.2. Effect of New Versions + +You may distribute the Covered Software under the terms of the version +of the License under which You originally received the Covered Software, +or under the terms of any subsequent version published by the license +steward. + +10.3. Modified Versions + +If you create software not governed by this License, and you want to +create a new license for such software, you may create and use a +modified version of this License if you rename the license and remove +any references to the name of the license steward (except to note that +such modified license differs from this License). + +10.4. Distributing Source Code Form that is Incompatible With Secondary +Licenses + +If You choose to distribute Source Code Form that is Incompatible With +Secondary Licenses under the terms of this version of the License, the +notice described in Exhibit B of this License must be attached. + +Exhibit A - Source Code Form License Notice +------------------------------------------- + + This Source Code Form is subject to the terms of the Mozilla Public + License, v. 2.0. If a copy of the MPL was not distributed with this + file, You can obtain one at http://mozilla.org/MPL/2.0/. + +If it is not possible or desirable to put the notice in a particular +file, then You may include the notice in a location (such as a LICENSE +file in a relevant directory) where a recipient would be likely to look +for such a notice. + +You may add additional accurate notices of copyright ownership. + +Exhibit B - "Incompatible With Secondary Licenses" Notice +--------------------------------------------------------- + + This Source Code Form is "Incompatible With Secondary Licenses", as + defined by the Mozilla Public License, v. 2.0. diff --git a/vendor/github.com/acaloiaro/go-envparse/NOTICES.txt b/vendor/github.com/acaloiaro/go-envparse/NOTICES.txt new file mode 100644 index 0000000..be407f4 --- /dev/null +++ b/vendor/github.com/acaloiaro/go-envparse/NOTICES.txt @@ -0,0 +1,2 @@ +go-envparse +Copyright 2017 HashiCorp, Inc. diff --git a/vendor/github.com/acaloiaro/go-envparse/README.md b/vendor/github.com/acaloiaro/go-envparse/README.md new file mode 100644 index 0000000..d3b3259 --- /dev/null +++ b/vendor/github.com/acaloiaro/go-envparse/README.md @@ -0,0 +1,91 @@ +[![Run CI Tests](https://github.com/hashicorp/go-envparse/actions/workflows/ci.yaml/badge.svg)](https://github.com/hashicorp/go-envparse/actions/workflows/ci.yaml) +[![Go Reference](https://pkg.go.dev/badge/github.com/hashicorp/go-envparse.svg)](https://pkg.go.dev/github.com/hashicorp/go-envparse) + +# go-envparse + +A minimal Go environment variable parser. It's intended to be used to parse +`.env` style files similar to [godotenv](https://github.com/joho/godotenv) or +[rubydotenv](https://github.com/bkeepers/dotenv), but perform minimal +allocations, handle more complex quoting, and be better tested. + +Parsing a line does 2 allocations regardless of line length or complexity. + +The parser supports JSON strings which allows for cross-language/platform +encoding of arbitrarily complex data. + +For example if you are parsing environment variables from a templated file, the +template can JSON encode data that may contain newlines: + +``` +FOO={{ some_template_function | toJSON }} +``` + +...would be templated to: + +``` +FOO="The template value\nmay have included\nsome newlines!\n\ud83d\udd25" +``` + +...and `envparse.Parse()` would return: + +```go +map[string]string{ + "FOO": "The template value\nmay have included\nsome newlines!\n🔥", +} +``` + +## Minimal + +The following common features *are intentionally missing*: + +* Full shell quoting semantics +* Full shell escape sequence support + * Only JSON escape sequences are supported (see below) +* Variable interpolation + * Use [Go's os.Expand](https://golang.org/pkg/os/#Expand) on the parsed + values +* Anything YAML related + * No + +However, comments, unquoted, single quoted, and double quoted text may all be +used within a single value: + +``` +SOME_KEY = normal unquoted \text 'plus single quoted\' "\"double quoted " # EOL +``` + +...parses to: + +```go +map[string]string{ + "SOME_KEY": `normal unquoted \text plus single quoted\ "double quoted ` +} +``` + +(Note the trailing space inside the double quote is kept, but the space between +the final `"` and `#` is trimmed.) + +## Format + +* Keys should be of the form: `[A-Za-z_][A-Za-z0-9_]?` + * Keys may be prefixed with `export ` which will be ignored + * Whitespace around keys will be trimmed +* Values should be valid ASCII or UTF-8 encoded. +* Newlines are always treated as delimiters, so newlines within values *must* + be escaped. +* Values may use one of more quoting styles: + * Unquoted - `FOO=bar baz` + * No escape sequences + * Ends at `#`, `"`, `'`, or newline + * Preceeding and trailing whitespace will be trimmed + * Double Quotes - `FOO="bar baz"` + * Supports JSON escape sequences: `\uXXXX`, `\r`, `\n`, `\t`, `\\`, and + `\"` + * Ends at unescaped `"` + * No whitespace trimming + * Single Quotes - `FOO='bar baz'` + * No escape sequences + * Ends at `'` + * No whitespace trimming + +See `envparse_test.go` for examples of valid and invalid data. diff --git a/vendor/github.com/acaloiaro/go-envparse/envparse.go b/vendor/github.com/acaloiaro/go-envparse/envparse.go new file mode 100644 index 0000000..9947929 --- /dev/null +++ b/vendor/github.com/acaloiaro/go-envparse/envparse.go @@ -0,0 +1,389 @@ +// Copyright (c) HashiCorp, Inc. +// SPDX-License-Identifier: MPL-2.0 + +// Package envparse is a minimal environment variable parser. It handles empty +// lines, comments, single quotes, double quotes, and JSON escape sequences. +// +// Non-empty or comment lines should be of the form: +// +// KEY=value +// +// While extraneous characters are discouraged, an "export" prefix, preceding +// whitespace, and trailing whitespace are all removed: +// +// KEY = This is ok! # Parses to {"KEY": "This is ok!"} +// KEY2= Also ok. # Parses to {"KEY2": "Also ok."} +// export FOO=bar # Parses to {"FOO": "bar"} +package envparse + +import ( + "bufio" + "bytes" + "errors" + "fmt" + "io" + "strings" + "unicode/utf16" + "unicode/utf8" +) + +const ( + InvalidKeyPrefixMsg = "key must start with [A-Za-z_] but found %q" + InvalidKeyMsg = "key characters must be [A-Za-z0-9/_.] but found %q" +) + +var ( + ErrMissingSeparator = fmt.Errorf("missing =") + ErrEmptyKey = fmt.Errorf("empty key") + ErrUnmatchedDouble = fmt.Errorf(`unmatched "`) + ErrUnmatchedSingle = fmt.Errorf("unmatched '") + ErrIncompleteEscape = fmt.Errorf("incomplete escape sequence") + ErrIncompleteHex = fmt.Errorf("incomplete hex sequence") + ErrIncompleteSur = fmt.Errorf("incomplete Unicode surrogate pair") + ErrMultibyteEscape = fmt.Errorf("multibyte characters disallowed in escape sequences") +) + +// ParseError is returned whenever the Parse function encounters an error. It +// includes the line number and underlying error. +type ParseError struct { + Line int + Err error +} + +func (e *ParseError) Error() string { + if e.Line > 0 { + return fmt.Sprintf("error on line %d: %v", e.Line, e.Err) + } + return fmt.Sprintf("error reading: %v", e.Err) +} + +func parseError(line int, err error) error { + return &ParseError{ + Line: line, + Err: err, + } +} + +// Parse environment variables from an io.Reader into a map or return a +// ParseError. +// +// Parses with strict mode, ensuring file lines contain only key-value pairs. +func Parse(r io.Reader) (map[string]string, error) { + env := make(map[string]string) + scanner := bufio.NewScanner(r) + + // Track line number + i := 0 + + // Main scan loop + for scanner.Scan() { + i++ + k, v, err := parseLine(scanner.Bytes()) + if err != nil { + return nil, parseError(i, err) + } + + // Skip blank lines + if len(k) > 0 { + env[string(k)] = string(v) + } + } + if err := scanner.Err(); err != nil { + return nil, parseError(i, err) + } + return env, nil +} + +// permittedError determines whether errors should be permitted by ParsePermissive +func permittedError(err error) bool { + invalidKeyMsg := strings.TrimSuffix(InvalidKeyMsg, "%q") + return errors.Is(err, ErrMissingSeparator) || strings.HasPrefix(err.Error(), invalidKeyMsg) +} + +// ParsePermissive parses environment variables from an io.Reader into a map or returns a +// ParseError. +// +// Parses with permissive mode, skipping file lines that don't contains key-value pairs. +func ParsePermissive(r io.Reader) (map[string]string, error) { + env := make(map[string]string) + scanner := bufio.NewScanner(r) + + // Track line number + i := 0 + + // Main scan loop + for scanner.Scan() { + i++ + k, v, err := parseLine(scanner.Bytes()) + if err != nil && permittedError(err) { + continue + } else if err != nil { + return nil, parseError(i, err) + } + + // Skip blank lines + if len(k) > 0 { + env[string(k)] = string(v) + } + } + if err := scanner.Err(); err != nil { + return nil, parseError(i, err) + } + + return env, nil +} + +const ( + normalMode = iota + doubleQuote = iota + singleQuote = iota + escapeMode = iota + unicodeMode = iota +) + +var ( + empty = []byte{} + separator = []byte{'='} + exportPrefix = []byte("export ") +) + +// parseLine parses the given line into a key and value or error. +// +// Empty lines are returned as zero length slices +func parseLine(ln []byte) ([]byte, []byte, error) { + ln = bytes.TrimSpace(ln) + if len(ln) == 0 || ln[0] == '#' { + return empty, empty, nil + } + + parts := bytes.SplitN(ln, separator, 2) + if len(parts) != 2 { + return nil, nil, ErrMissingSeparator + } + + // Trim whitespace + key, value := bytes.TrimSpace(parts[0]), bytes.TrimSpace(parts[1]) + + // Ensure key is of the form [A-Za-z][A-Za-z0-9_]? with an optional + // leading 'export ', but only trim leading export if there's another + // key name. + if len(key) > len(exportPrefix) { + key = bytes.TrimPrefix(key, exportPrefix) + } + if len(key) == 0 { + return nil, nil, ErrEmptyKey + } + if key[0] < 'A' { + return nil, nil, fmt.Errorf(InvalidKeyPrefixMsg, key[0]) + } + if key[0] > 'Z' && key[0] < 'a' && key[0] != '_' { + return nil, nil, fmt.Errorf(InvalidKeyPrefixMsg, key[0]) + } + if key[0] > 'z' { + return nil, nil, fmt.Errorf(InvalidKeyPrefixMsg, key[0]) + } + + for _, v := range key[1:] { + switch { + case v == '_': + case v == '.': + case v == '/': + case v >= 'A' && v <= 'Z': + case v >= 'a' && v <= 'z': + case v >= '0' && v <= '9': + default: + return nil, nil, fmt.Errorf(InvalidKeyMsg, v) + } + } + + // Evaluate the value + if len(value) == 0 { + // Empty values are ok! Shortcircuit + return key, value, nil + } + + // Scratch buffer for unescaped value + newv := make([]byte, len(value)) + newi := 0 + // Track last significant character for trimming unquoted whitespace preceding a trailing comment + lastSig := 0 + + // Parser State + mode := normalMode + + for i := 0; i < len(value); i++ { + v := value[i] + + // Control characters are always an error + if v < 32 { + return nil, nil, fmt.Errorf("0x%0.2x is an invalid value character", v) + } + + // High bit set means it is part of a multibyte character, pass + // it through as only ASCII characters have special meaning. + if v > 127 { + if mode == escapeMode { + return nil, nil, ErrMultibyteEscape + } + // All multibyte characters are significant + lastSig = newi + newv[newi] = v + newi++ + continue + } + + switch mode { + case normalMode: + switch v { + case '"': + mode = doubleQuote + case '\'': + mode = singleQuote + case '#': + // Start of a comment, nothing left to parse + return key, newv[:lastSig], nil + case ' ', '\t': + // Make sure whitespace doesn't get tracked + newv[newi] = v + newi++ + default: + // Add the character to the new value + newv[newi] = v + newi++ + + // Track last non-WS char for trimming on trailing comments + lastSig = newi + } + case doubleQuote: + switch v { + case '"': + mode = normalMode + case '\\': + mode = escapeMode + default: + // Add the character to the new value + newv[newi] = v + newi++ + + // All quoted characters are significant + lastSig = newi + } + case escapeMode: + // We're in double quotes and the last character was a backslash + switch v { + case '"': + newv[newi] = v + case '\\': + newv[newi] = v + case '/': + newv[newi] = v + case 'b': + newv[newi] = '\b' + case 'f': + newv[newi] = '\f' + case 'r': + newv[newi] = '\r' + case 'n': + newv[newi] = '\n' + case 't': + newv[newi] = '\t' + case 'u': + // Parse-ahead to capture unicode + r, err := h2r(value[i+1:]) + if err != nil { + return nil, nil, err + } + + // Bump index by width of hex chars + i += 4 + + // Check if we need to get another rune + if utf16.IsSurrogate(r) { + if len(value) < i+6 { + //TODO Use replacement character instead? + return nil, nil, ErrIncompleteSur + } + if value[i+1] != '\\' || value[i+2] != 'u' { + //TODO Use replacement character instead? + return nil, nil, ErrIncompleteSur + } + + r2, err := h2r(value[i+3:]) + if err != nil { + return nil, nil, err + } + + // Bump index by width of \uXXXX + i += 6 + + r = utf16.DecodeRune(r, r2) + } + n := utf8.EncodeRune(newv[newi:], r) + newi += n - 1 // because it's incremented outside the switch + default: + return nil, nil, fmt.Errorf("invalid escape sequence: %q", string(v)) + } + // Add the character to the new value + newi++ + + // All escaped characters are significant + lastSig = newi + + // Switch back to quote mode + mode = doubleQuote + case singleQuote: + switch v { + case '\'': + mode = normalMode + default: + // Add all other characters to the new value + newv[newi] = v + newi++ + + // All single quoted characters are significant + lastSig = newi + } + default: + panic(fmt.Errorf("BUG: invalid mode: %v", mode)) + } + } + + switch mode { + case normalMode: + // All escape sequences are complete and all quotes are matched + return key, newv[:newi], nil + case doubleQuote: + return nil, nil, ErrUnmatchedDouble + case singleQuote: + return nil, nil, ErrUnmatchedSingle + case escapeMode: + return nil, nil, ErrIncompleteEscape + default: + panic(fmt.Errorf("BUG: invalid mode: %v", mode)) + } +} + +// convert hex characters into a rune +func h2r(buf []byte) (rune, error) { + if len(buf) < 4 { + return 0, ErrIncompleteHex + } + var r rune + for i := 0; i < 4; i++ { + d := buf[i] + switch { + case '0' <= d && d <= '9': + d = d - '0' + case 'a' <= d && d <= 'f': + d = d - 'a' + 10 + case 'A' <= d && d <= 'F': + d = d - 'A' + 10 + default: + return 0, fmt.Errorf("invalid hex character: %q", string(d)) + } + + r *= 16 + r += rune(d) + } + return r, nil +} diff --git a/vendor/github.com/acaloiaro/go-envparse/flake.lock b/vendor/github.com/acaloiaro/go-envparse/flake.lock new file mode 100644 index 0000000..b4addc9 --- /dev/null +++ b/vendor/github.com/acaloiaro/go-envparse/flake.lock @@ -0,0 +1,279 @@ +{ + "nodes": { + "cachix": { + "inputs": { + "devenv": [ + "devenv" + ], + "flake-compat": [ + "devenv" + ], + "git-hooks": [ + "devenv" + ], + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1728672398, + "narHash": "sha256-KxuGSoVUFnQLB2ZcYODW7AVPAh9JqRlD5BrfsC/Q4qs=", + "owner": "cachix", + "repo": "cachix", + "rev": "aac51f698309fd0f381149214b7eee213c66ef0a", + "type": "github" + }, + "original": { + "owner": "cachix", + "ref": "latest", + "repo": "cachix", + "type": "github" + } + }, + "devenv": { + "inputs": { + "cachix": "cachix", + "flake-compat": "flake-compat", + "git-hooks": "git-hooks", + "nix": "nix", + "nixpkgs": "nixpkgs_3" + }, + "locked": { + "lastModified": 1735557386, + "narHash": "sha256-aZ/PfrgxG8l92hfNZJSTQF3pCzRpYCzyKAUPzf7j4tk=", + "owner": "cachix", + "repo": "devenv", + "rev": "1cd2afada1b407d1f7d2eca91984ed5c85ffb2f7", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "devenv", + "type": "github" + } + }, + "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-parts": { + "inputs": { + "nixpkgs-lib": [ + "devenv", + "nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1712014858, + "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "git-hooks": { + "inputs": { + "flake-compat": [ + "devenv" + ], + "gitignore": "gitignore", + "nixpkgs": [ + "devenv", + "nixpkgs" + ], + "nixpkgs-stable": [ + "devenv" + ] + }, + "locked": { + "lastModified": 1730302582, + "narHash": "sha256-W1MIJpADXQCgosJZT8qBYLRuZls2KSiKdpnTVdKBuvU=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "af8a16fe5c264f5e9e18bcee2859b40a656876cf", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, + "gitignore": { + "inputs": { + "nixpkgs": [ + "devenv", + "git-hooks", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1709087332, + "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, + "libgit2": { + "flake": false, + "locked": { + "lastModified": 1697646580, + "narHash": "sha256-oX4Z3S9WtJlwvj0uH9HlYcWv+x1hqp8mhXl7HsLu2f0=", + "owner": "libgit2", + "repo": "libgit2", + "rev": "45fd9ed7ae1a9b74b957ef4f337bc3c8b3df01b5", + "type": "github" + }, + "original": { + "owner": "libgit2", + "repo": "libgit2", + "type": "github" + } + }, + "nix": { + "inputs": { + "flake-compat": [ + "devenv" + ], + "flake-parts": "flake-parts", + "libgit2": "libgit2", + "nixpkgs": "nixpkgs_2", + "nixpkgs-23-11": [ + "devenv" + ], + "nixpkgs-regression": [ + "devenv" + ], + "pre-commit-hooks": [ + "devenv" + ] + }, + "locked": { + "lastModified": 1727438425, + "narHash": "sha256-X8ES7I1cfNhR9oKp06F6ir4Np70WGZU5sfCOuNBEwMg=", + "owner": "domenkozar", + "repo": "nix", + "rev": "f6c5ae4c1b2e411e6b1e6a8181cc84363d6a7546", + "type": "github" + }, + "original": { + "owner": "domenkozar", + "ref": "devenv-2.24", + "repo": "nix", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1730531603, + "narHash": "sha256-Dqg6si5CqIzm87sp57j5nTaeBbWhHFaVyG7V6L8k3lY=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "7ffd9ae656aec493492b44d0ddfb28e79a1ea25d", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { + "locked": { + "lastModified": 1717432640, + "narHash": "sha256-+f9c4/ZX5MWDOuB1rKoWj+lBNm0z0rs4CK47HBLxy1o=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "88269ab3044128b7c2f4c7d68448b2fb50456870", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "release-24.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1716977621, + "narHash": "sha256-Q1UQzYcMJH4RscmpTkjlgqQDX5yi1tZL0O345Ri6vXQ=", + "owner": "cachix", + "repo": "devenv-nixpkgs", + "rev": "4267e705586473d3e5c8d50299e71503f16a6fb6", + "type": "github" + }, + "original": { + "owner": "cachix", + "ref": "rolling", + "repo": "devenv-nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { + "locked": { + "lastModified": 1735617354, + "narHash": "sha256-5zJyv66q68QZJZsXtmjDBazGnF0id593VSy+8eSckoo=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "69b9a8c860bdbb977adfa9c5e817ccb717884182", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "devenv": "devenv", + "nixpkgs": "nixpkgs_4", + "systems": "systems" + } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/vendor/github.com/acaloiaro/go-envparse/flake.nix b/vendor/github.com/acaloiaro/go-envparse/flake.nix new file mode 100644 index 0000000..b776559 --- /dev/null +++ b/vendor/github.com/acaloiaro/go-envparse/flake.nix @@ -0,0 +1,46 @@ +{ + inputs = { + nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; + systems.url = "github:nix-systems/default"; + devenv.url = "github:cachix/devenv"; + }; + + outputs = { + self, + nixpkgs, + devenv, + systems, + ... + } @ inputs: let + forEachSystem = nixpkgs.lib.genAttrs (import systems); + in { + packages = forEachSystem (system: let + callPackage = nixpkgs.darwin.apple_sdk_11_0.callPackage or nixpkgs.legacyPackages.${system}.callPackage; + in { + default = callPackage ./. {}; + }); + + devShells = forEachSystem (system: let + pkgs = nixpkgs.legacyPackages.${system}; + in { + default = devenv.lib.mkShell { + inherit inputs pkgs; + modules = [ + { + packages = with pkgs; [ + automake + go_1_23 + gotools + golangci-lint + go-tools + gopls + nix-update + pre-commit + svu + ]; + } + ]; + }; + }); + }; +} diff --git a/vendor/modules.txt b/vendor/modules.txt new file mode 100644 index 0000000..1a6313b --- /dev/null +++ b/vendor/modules.txt @@ -0,0 +1,3 @@ +# github.com/acaloiaro/go-envparse v0.5.0 +## explicit; go 1.24 +github.com/acaloiaro/go-envparse