From 6a08012b6fcf3c1795da6dea1c0ff485480720e5 Mon Sep 17 00:00:00 2001 From: Phillip Cloud <417981+cpcloud@users.noreply.github.com> Date: Sun, 31 Mar 2024 05:58:07 -0400 Subject: [PATCH] chore(deps): downgrade nixpkgs (#8834) --- .github/workflows/nix-skip-helper.yml | 1 - .github/workflows/nix.yml | 1 - flake.lock | 8 ++++---- flake.nix | 10 +++++----- nix/overlay.nix | 2 +- 5 files changed, 10 insertions(+), 12 deletions(-) diff --git a/.github/workflows/nix-skip-helper.yml b/.github/workflows/nix-skip-helper.yml index aca9879f1871..7c09f2c2b9f0 100644 --- a/.github/workflows/nix-skip-helper.yml +++ b/.github/workflows/nix-skip-helper.yml @@ -36,6 +36,5 @@ jobs: - "3.9" - "3.10" - "3.11" - - "3.12" steps: - run: echo "No build required" diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml index 95bb6e52dfa8..c9747dc72c2c 100644 --- a/.github/workflows/nix.yml +++ b/.github/workflows/nix.yml @@ -37,7 +37,6 @@ jobs: - "3.9" - "3.10" - "3.11" - - "3.12" steps: - name: checkout uses: actions/checkout@v4 diff --git a/flake.lock b/flake.lock index c9558ae2449d..6dafe0c40a3f 100644 --- a/flake.lock +++ b/flake.lock @@ -61,16 +61,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1711153457, - "narHash": "sha256-nyF133G37SgxqfxJuSK10thvG2+xCcabfEBYPN7R2lE=", + "lastModified": 1711668574, + "narHash": "sha256-u1dfs0ASQIEr1icTVrsKwg2xToIpn7ZXxW3RHfHxshg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "821ddb024d15c0679e2c87511db2e4e505a03fd8", + "rev": "219951b495fc2eac67b1456824cc1ec1fd2ee659", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable-small", + "ref": "nixos-23.11", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 858eff0aa63e..ee723547e7ad 100644 --- a/flake.nix +++ b/flake.nix @@ -9,7 +9,7 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable-small"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11"; poetry2nix = { url = "github:nix-community/poetry2nix"; @@ -73,7 +73,7 @@ git just nixpkgs-fmt - nodePackages.prettier + nodejs_20.pkgs.prettier shellcheck shfmt statix @@ -98,7 +98,7 @@ # link checking lychee # release automation - nodejs + nodejs_20 # used in notebooks to download data curl # docs @@ -138,7 +138,7 @@ ibis311 = mkDevShell pkgs.ibisDevEnv311; ibis312 = mkDevShell pkgs.ibisDevEnv312; - default = ibis312; + default = ibis311; preCommit = pkgs.mkShell { name = "preCommit"; @@ -152,7 +152,7 @@ release = pkgs.mkShell { name = "release"; - nativeBuildInputs = with pkgs; [ git poetry nodejs unzip gnugrep ]; + nativeBuildInputs = with pkgs; [ git poetry nodejs_20 unzip gnugrep ]; }; }; } diff --git a/nix/overlay.nix b/nix/overlay.nix index 72661c22d1c8..debe9399ebb5 100644 --- a/nix/overlay.nix +++ b/nix/overlay.nix @@ -36,7 +36,7 @@ in ibisDevEnv312 = mkPoetryDevEnv pkgs.python312; ibisSmallDevEnv = mkPoetryEnv { - python = pkgs.python312; + python = pkgs.python311; groups = [ "dev" ]; extras = [ ]; };