diff --git a/.vscode/settings.json b/.vscode/settings.json index 63cbe4f..2d0beb9 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -4,7 +4,7 @@ "nix.serverSettings": { "nixd": { "nixpkgs": { - "expr": "import (builtins.getFlake (builtins.toString ./.)).inputs.nixpkgs { }" + "expr": "let f = builtins.getFlake (builtins.toString ./.); in import f.inputs.nixpkgs { overlays = [ f.inputs.org-pkgs.overlays.default ]; }" }, "formatting": { "command": ["alejandra", "--quiet"] diff --git a/devenv.lock b/devenv.lock index b8d4682..6337214 100644 --- a/devenv.lock +++ b/devenv.lock @@ -144,38 +144,21 @@ ], "org-pkgs": [ "org-pkgs" - ], - "pyproject-build-systems": [ - "org-pkgs", - "moscripts", - "org-pkgs", - "pyproject-build-systems" - ], - "pyproject-nix": [ - "org-pkgs", - "moscripts", - "org-pkgs", - "pyproject-nix" - ], - "uv2nix": [ - "org-pkgs", - "moscripts", - "org-pkgs", - "uv2nix" ] }, "locked": { - "lastModified": 1794671732, - "narHash": "sha256-GHuABElJG+GkNLYS436iwgA8NYH/3spSv+X7rbvc1Rs=", - "owner": "andrewthomaslee", - "repo": "moscripts", - "rev": "4b47154622af59dc0269ce8875fdf21b8c2da491", - "type": "github" + "lastModified": 1794680356, + "narHash": "sha256-qJQQqY4IIpIo4EVjuYGnp7sLlPiEqC4XcGtM8IAI37U=", + "ref": "main", + "rev": "e351fa8bf25d306bae1335d128d6870c213bfae7", + "revCount": 79, + "type": "git", + "url": "https://github.com/andrewthomaslee/moscripts" }, "original": { - "owner": "andrewthomaslee", - "repo": "moscripts", - "type": "github" + "ref": "main", + "type": "git", + "url": "https://github.com/andrewthomaslee/moscripts" } }, "nix-vscode-extensions": { @@ -231,17 +214,17 @@ "zen-browser": "zen-browser" }, "locked": { - "lastModified": 1794671936, - "narHash": "sha256-QS24ORMSPj/Fn4IMyAl9GyqmFSxZoIASe1DHP3oWH4U=", + "lastModified": 1794680531, + "narHash": "sha256-nZyIl+U5yHeOS2aNmh7rl5Hmp62aZdPQhCixtC2nRMk=", "owner": "external-systems", "repo": "pkgs", - "rev": "cd8dedf4676f2c5815a0f7473f2b199ddea105a7", + "rev": "8a04c686191637246ffd621d4c872a030e81cf73", "type": "github" }, "original": { "owner": "external-systems", "repo": "pkgs", - "rev": "cd8dedf4676f2c5815a0f7473f2b199ddea105a7", + "rev": "8a04c686191637246ffd621d4c872a030e81cf73", "type": "github" } }, diff --git a/devenv.yaml b/devenv.yaml index 77973a6..a58d969 100644 --- a/devenv.yaml +++ b/devenv.yaml @@ -6,7 +6,7 @@ # pkgs ("attribute 'bash' missing"). inputs: org-pkgs: - url: github:external-systems/pkgs/cd8dedf4676f2c5815a0f7473f2b199ddea105a7 + url: github:external-systems/pkgs/8a04c686191637246ffd621d4c872a030e81cf73 nixpkgs: follows: org-pkgs/nixpkgs imports: diff --git a/flake.lock b/flake.lock index eedfe10..2c55260 100644 --- a/flake.lock +++ b/flake.lock @@ -229,38 +229,21 @@ ], "org-pkgs": [ "org-pkgs" - ], - "pyproject-build-systems": [ - "org-pkgs", - "moscripts", - "org-pkgs", - "pyproject-build-systems" - ], - "pyproject-nix": [ - "org-pkgs", - "moscripts", - "org-pkgs", - "pyproject-nix" - ], - "uv2nix": [ - "org-pkgs", - "moscripts", - "org-pkgs", - "uv2nix" ] }, "locked": { - "lastModified": 1794671732, - "narHash": "sha256-GHuABElJG+GkNLYS436iwgA8NYH/3spSv+X7rbvc1Rs=", - "owner": "andrewthomaslee", - "repo": "moscripts", - "rev": "4b47154622af59dc0269ce8875fdf21b8c2da491", - "type": "github" + "lastModified": 1794680356, + "narHash": "sha256-qJQQqY4IIpIo4EVjuYGnp7sLlPiEqC4XcGtM8IAI37U=", + "ref": "main", + "rev": "e351fa8bf25d306bae1335d128d6870c213bfae7", + "revCount": 79, + "type": "git", + "url": "https://github.com/andrewthomaslee/moscripts" }, "original": { - "owner": "andrewthomaslee", - "repo": "moscripts", - "type": "github" + "ref": "main", + "type": "git", + "url": "https://github.com/andrewthomaslee/moscripts" } }, "nix-github-actions": { @@ -354,11 +337,11 @@ "zen-browser": "zen-browser" }, "locked": { - "lastModified": 1794671936, - "narHash": "sha256-QS24ORMSPj/Fn4IMyAl9GyqmFSxZoIASe1DHP3oWH4U=", + "lastModified": 1794680531, + "narHash": "sha256-nZyIl+U5yHeOS2aNmh7rl5Hmp62aZdPQhCixtC2nRMk=", "owner": "external-systems", "repo": "pkgs", - "rev": "cd8dedf4676f2c5815a0f7473f2b199ddea105a7", + "rev": "8a04c686191637246ffd621d4c872a030e81cf73", "type": "github" }, "original": { @@ -507,11 +490,11 @@ "skills-terraform": "skills-terraform" }, "locked": { - "lastModified": 1794614196, - "narHash": "sha256-eB2IGmOVJHlXVwEFUy+aJ5//ioSfUpxmIZu41gM7feg=", + "lastModified": 1794680671, + "narHash": "sha256-70rGni/4xA7mpWG/nkm+iVjc1fS4OuVyI2ejePRAV+o=", "owner": "external-systems", "repo": "skills", - "rev": "d6f59bff3c9625177994c8d253c3f408bbf08cac", + "rev": "bede943006539052a2c582d6e3fdaedfd1b879fe", "type": "github" }, "original": {