Skip to content

Commit

Permalink
Remove devenv and change to vanilla flake (#3)
Browse files Browse the repository at this point in the history
Removed devenv as it was causing pain.
It was a bit of a hassle to move from devenv to vanilla flake and port over the existing library.

Seems to largely work and I've migrated over the github.yml file as well.

TODO: Update the README to reflect the new state of the world and maybe add flake checks.
  • Loading branch information
fzakaria authored Aug 30, 2023
1 parent ae4be96 commit 55856f3
Show file tree
Hide file tree
Showing 43 changed files with 585 additions and 9,763 deletions.
9 changes: 0 additions & 9 deletions .devcontainer.json

This file was deleted.

4 changes: 1 addition & 3 deletions .envrc
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
source_url "https://raw.githubusercontent.com/cachix/devenv/d1f7b48e35e6dee421cfd0f51481d17f77586997/direnvrc" "sha256-YBzqskFZxmNb3kYVoKD9ZixoPXJh1C9ZvTLGFRkauZ0="

use devenv
use flake
15 changes: 4 additions & 11 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,11 @@ jobs:
- uses: actions/checkout@v3
- uses: cachix/install-nix-action@v20
with:
extra_nix_config: |
access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
nix_path: nixpkgs=channel:nixos-unstable
- uses: cachix/cachix-action@v12
with:
name: fzakaria
extraPullNames: devenv
authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
- name: Install devenv.sh
run: nix profile install github:cachix/devenv/latest
shell: sh
- name: Run tests
run: |
devenv ci
devenv shell make lint
devenv shell python -m sqlelf --help
- run: nix develop --command make lint
- run: nix build --print-build-logs
- run: nix run . -- --help
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,7 @@
devenv.local.nix
.direnv/
sqlelf.egg-info/
*.pyc
*.pyc
.vscode/
dist/
result
1 change: 0 additions & 1 deletion .pre-commit-config.yaml

This file was deleted.

5 changes: 5 additions & 0 deletions derivation.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{ poetry2nix, poetryOverrides }:
poetry2nix.mkPoetryApplication {
projectDir = ./.;
overrides = poetry2nix.overrides.withDefaults poetryOverrides;
}
138 changes: 0 additions & 138 deletions devenv.lock

This file was deleted.

58 changes: 0 additions & 58 deletions devenv.nix

This file was deleted.

3 changes: 0 additions & 3 deletions devenv.yaml

This file was deleted.

107 changes: 107 additions & 0 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 55856f3

Please sign in to comment.