ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-04-20 16:51:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

slightly regularize nixpkgs handling

Browse Source
This commit is contained in:
Jean-Paul Calderone 2023-07-04 14:20:50 -04:00
parent 8a53175655
commit bf1db85219
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.circleci/config.yml
View File

@ -89,7 +89,7 @@ workflows:
- "nixos":
name: "<<matrix.pythonVersion>>"
nixpkgs: "22_11"
nixpkgs: "nixpkgs-22_11"
matrix:
parameters:
pythonVersion:
@ -99,7 +99,7 @@ workflows:
- "nixos":
name: "<<matrix.pythonVersion>>"
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-<<parameters.nixpkgs>>)
NIXPKGS=$(nixpkgs_flake_reference <<parameters.nixpkgs>>)
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-<<parameters.nixpkgs>>)
NIXPKGS=$(nixpkgs_flake_reference <<parameters.nixpkgs>>)
cache_if_able nix build \
--verbose \
--print-build-logs \