diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml index 5a1558df662e..c046aecd4ec6 100644 --- a/.github/workflows/nix.yml +++ b/.github/workflows/nix.yml @@ -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: diff --git a/default.nix b/default.nix deleted file mode 100644 index 873ece493703..000000000000 --- a/default.nix +++ /dev/null @@ -1,13 +0,0 @@ -(import - ( - let - lock = builtins.fromJSON (builtins.readFile ./flake.lock); - in - fetchTarball { - url = "https://github.com/edolstra/flake-compat/archive/${lock.nodes.flake-compat.locked.rev}.tar.gz"; - sha256 = lock.nodes.flake-compat.locked.narHash; - } - ) - { - src = ./.; - }).defaultNix diff --git a/flake.lock b/flake.lock index 5d78aedb0123..e58a596abd04 100644 --- a/flake.lock +++ b/flake.lock @@ -1,21 +1,5 @@ { "nodes": { - "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-utils": { "inputs": { "systems": "systems" @@ -62,11 +46,11 @@ ] }, "locked": { - "lastModified": 1688870561, - "narHash": "sha256-4UYkifnPEw1nAzqqPOTL2MvWtm3sNGw1UTYTalkTcGY=", + "lastModified": 1693660503, + "narHash": "sha256-B/g2V4v6gjirFmy+I5mwB2bCYc0l3j5scVfwgl6WOl8=", "owner": "nix-community", "repo": "nix-github-actions", - "rev": "165b1650b753316aa7f1787f3005a8d2da0f5301", + "rev": "bd5bdbb52350e145c526108f4ef192eb8e554fa0", "type": "github" }, "original": { @@ -77,11 +61,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1693070341, - "narHash": "sha256-6qmVJpnO0Mg2kQvPOR3wQiFlTZXzcpA8leVWuPmvMdo=", + "lastModified": 1697935353, + "narHash": "sha256-dDwl5ziD24Gs0feke2seFXoQibHafb5XeNDWlUZxCbg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5a77c45f2519143e22582285eb0c660be38b104a", + "rev": "8dfad603247387df1df4826b8bea58efc5d012d8", "type": "github" }, "original": { @@ -102,11 +86,11 @@ ] }, "locked": { - "lastModified": 1698149542, - "narHash": "sha256-08QeSVjbt6eymdkD+Kc4NwQqyktTdvBs2Lrim5mSz8A=", + "lastModified": 1698273246, + "narHash": "sha256-gwlz94Vth1eMXP7AraLJ4gKh9WA6J6k92KfD9AKlkT0=", "owner": "nix-community", "repo": "poetry2nix", - "rev": "026032a8b4e6e948c608de0fc559c6d0256e6117", + "rev": "e40ed935f10eeb2fb454f11ff204b821fe351d9f", "type": "github" }, "original": { @@ -117,7 +101,6 @@ }, "root": { "inputs": { - "flake-compat": "flake-compat", "flake-utils": "flake-utils", "gitignore": "gitignore", "nixpkgs": "nixpkgs", diff --git a/flake.nix b/flake.nix index 65b001121784..eec7fe9200b1 100644 --- a/flake.nix +++ b/flake.nix @@ -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 = { @@ -88,7 +83,7 @@ # python dev environment env # poetry executable - env.pkgs.poetry + poetry # rendering release notes changelog glow @@ -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 { diff --git a/nix/overlay.nix b/nix/overlay.nix index 2a45217a7a2d..0e9fbfe4cc95 100644 --- a/nix/overlay.nix +++ b/nix/overlay.nix @@ -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 - ''; - }; } diff --git a/poetry-overrides.nix b/poetry-overrides.nix index 27f7d95097a4..664d1134aa21 100644 --- a/poetry-overrides.nix +++ b/poetry-overrides.nix @@ -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 # diff --git a/shell.nix b/shell.nix deleted file mode 100644 index 9eb132a589d4..000000000000 --- a/shell.nix +++ /dev/null @@ -1,13 +0,0 @@ -(import - ( - let - lock = builtins.fromJSON (builtins.readFile ./flake.lock); - in - fetchTarball { - url = "https://github.com/edolstra/flake-compat/archive/${lock.nodes.flake-compat.locked.rev}.tar.gz"; - sha256 = lock.nodes.flake-compat.locked.narHash; - } - ) - { - src = ./.; - }).shellNix