From f800c24e3145edf1aae5a2df106d7ea3982c2306 Mon Sep 17 00:00:00 2001 From: luchiniatwork Date: Tue, 25 Jul 2023 15:28:32 -0400 Subject: [PATCH] fix: remove named devShell dummy test The feature didn't work nor was clear --- .github/workflows/test.yml | 8 -------- flake.nix | 4 +--- src/main.ts | 2 +- 3 files changed, 2 insertions(+), 12 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 693de11..520e1a8 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -142,14 +142,6 @@ jobs: script: | pwd figlet "I'm from the devshell, baby." - - name: Test Bash Shell with Local Flake (named devShell) - uses: ./ - with: - flakes: .#named-shell - flakes-from-devshell: true - script: | - pwd - figlet "I'm from the devshell name 'named-shell', baby." test-flakes-from-devshell-in-working-directory: runs-on: ubuntu-latest diff --git a/flake.nix b/flake.nix index 3bf40da..75ef857 100644 --- a/flake.nix +++ b/flake.nix @@ -7,11 +7,9 @@ packages.x86_64-linux.default = self.packages.x86_64-linux.hello; - devShells.x86_64-linux.named-shell = nixpkgs.legacyPackages.x86_64-linux.mkShell { + devShells.x86_64-linux.default = nixpkgs.legacyPackages.x86_64-linux.mkShell { buildInputs = [ nixpkgs.legacyPackages.x86_64-linux.figlet ]; }; - devShells.x86_64-linux.default = self.devShells.x86_64-linux.named-shell; - }; } diff --git a/src/main.ts b/src/main.ts index 7ecdcdd..103b6c3 100644 --- a/src/main.ts +++ b/src/main.ts @@ -24,7 +24,7 @@ function run(): void { .join(' ') const flakeWrappedPackages = flakesFromDevshell - ? '' + ? flakes : flakes.split(',').join(' ') || packages .split(',')