From bf1db852197d22d307777a0005104d987ca92a48 Mon Sep 17 00:00:00 2001 From: Jean-Paul Calderone Date: Tue, 4 Jul 2023 14:20:50 -0400 Subject: [PATCH] slightly regularize nixpkgs handling --- .circleci/config.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 01cd999ca..21d6a6114 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -89,7 +89,7 @@ workflows: - "nixos": name: "<>" - nixpkgs: "22_11" + nixpkgs: "nixpkgs-22_11" matrix: parameters: pythonVersion: @@ -99,7 +99,7 @@ workflows: - "nixos": name: "<>" - nixpkgs: "unstable" + nixpkgs: "nixpkgs-unstable" matrix: parameters: pythonVersion: @@ -385,8 +385,8 @@ jobs: parameters: nixpkgs: description: >- - Reference the name of a niv-managed nixpkgs source (see `niv show` - and nix/sources.json) + Reference the name of a flake-managed nixpkgs input (see `nix flake + metadata` and flake.nix) type: "string" pythonVersion: description: >- @@ -407,7 +407,7 @@ jobs: # Translate the nixpkgs selection into a flake reference we # can use to override the default nixpkgs input. - NIXPKGS=$(nixpkgs_flake_reference nixpkgs-<>) + NIXPKGS=$(nixpkgs_flake_reference <>) cache_if_able nix run \ --override-input nixpkgs "$NIXPKGS" \ @@ -595,7 +595,7 @@ commands: name: "Build Package" command: | source .circleci/lib.sh - NIXPKGS=$(nixpkgs_flake_reference nixpkgs-<>) + NIXPKGS=$(nixpkgs_flake_reference <>) cache_if_able nix build \ --verbose \ --print-build-logs \