Skip to content

Commit

Permalink
chore(deps): bump nixpkgs
Browse files Browse the repository at this point in the history
  • Loading branch information
cpcloud committed Oct 25, 2023
1 parent 9b6f804 commit e654a15
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 87 deletions.
3 changes: 0 additions & 3 deletions .github/workflows/nix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,6 @@ jobs:
extra_nix_config: |
access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
- name: check poetry version
run: nix run '.#check-poetry-version' -- "1.6.1"

- name: setup cachix
uses: cachix/cachix-action@v12
with:
Expand Down
13 changes: 0 additions & 13 deletions default.nix

This file was deleted.

35 changes: 9 additions & 26 deletions flake.lock

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

9 changes: 2 additions & 7 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,6 @@
description = "Expressive Python analytics at any scale.";

inputs = {
flake-compat = {
url = "github:edolstra/flake-compat";
flake = false;
};

flake-utils.url = "github:numtide/flake-utils";

gitignore = {
Expand Down Expand Up @@ -88,7 +83,7 @@
# python dev environment
env
# poetry executable
env.pkgs.poetry
poetry
# rendering release notes
changelog
glow
Expand Down Expand Up @@ -125,7 +120,7 @@

default = pkgs.ibis310;

inherit (pkgs) update-lock-files gen-all-extras gen-examples check-poetry-version check-release-notes-spelling;
inherit (pkgs) update-lock-files gen-all-extras gen-examples check-release-notes-spelling;
};

devShells = rec {
Expand Down
21 changes: 0 additions & 21 deletions nix/overlay.nix
Original file line number Diff line number Diff line change
Expand Up @@ -99,25 +99,4 @@ in
yj -tj < pyproject.toml | jq -rM '.tool.poetry.extras | with_entries(select(.key != "all")) | [.[]] | add | unique | sort'
'';
};

check-poetry-version = pkgs.writeShellApplication {
name = "check-poetry-version";
runtimeInputs = [
(
mkPoetryEnv {
python = pkgs.python3;
groups = [ ];
extras = [ ];
}
).pkgs.poetry
];
text = ''
expected="$1"
out="$(poetry --version --no-ansi)"
if [[ "$out" != *"$expected"* ]]; then
>&2 echo "error: expected version $expected; got: $out"
exit 1
fi
'';
};
}
4 changes: 0 additions & 4 deletions poetry-overrides.nix
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
self: super: {
# `wheel` cannot be used as a wheel to unpack itself, since that would
# require itself (infinite recursion)
wheel = super.wheel.override { preferWheel = false; };

# patch oscrypto for openssl 3 support: the fix is to relax some regexes that
# inspect the libcrypto version
#
Expand Down
13 changes: 0 additions & 13 deletions shell.nix

This file was deleted.

0 comments on commit e654a15

Please sign in to comment.