Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump nixpkgs #1489

Open
wants to merge 22 commits into
base: main
Choose a base branch
from
Open

Bump nixpkgs #1489

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
677f8ae
python: adjust wrapper to fix propagating dependencies to virtual envs
vlaci Sep 27, 2024
46b7d94
try out latest nixpkgs
domenkozar Oct 1, 2024
9eeafdf
fix python wrapper
domenkozar Oct 5, 2024
66320f4
fix #1252: set --disable-dotenv for process-compose
domenkozar Oct 7, 2024
b456bac
bump nixpkgs
domenkozar Oct 15, 2024
c9f0181
format
domenkozar Oct 16, 2024
f3ff433
fix pre-commit hook
domenkozar Oct 16, 2024
7975655
dev: bump devenv.lock
sandydoo Oct 16, 2024
7f3343c
fix tailwindcss
domenkozar Oct 17, 2024
5c478e6
bump devenv.lock
domenkozar Oct 17, 2024
8efd32c
Merge remote-tracking branch 'origin/main' into bump-nixpkgs
sandydoo Nov 18, 2024
ab6d7d3
dev: bump devenv.lock
sandydoo Nov 18, 2024
5b40733
docs: bump tailwind css
sandydoo Nov 19, 2024
70a9433
dev: commit rolling changes
sandydoo Nov 19, 2024
4986b6e
python: sprinkle exits in setup scripts to trigger task errors
sandydoo Nov 19, 2024
c403b3f
examples: bump python-poetry lockfile
sandydoo Nov 19, 2024
f812864
services: mongodb use binary distro
domenkozar Nov 28, 2024
92a7790
Auto generate docs/reference/options.md
github-actions[bot] Nov 28, 2024
7f17636
Auto generate docs and examples
github-actions[bot] Nov 28, 2024
5435146
python: disable manylinux as it causes trouble
domenkozar Nov 28, 2024
9cd2f9e
fail examples if they can't be generated
domenkozar Nov 29, 2024
38be74c
bump deps
domenkozar Nov 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
225 changes: 128 additions & 97 deletions .github/workflows/buildtest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,50 +13,62 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [[self-hosted, linux, X64], [macos-13], [self-hosted, macOS, ARM64], [self-hosted, linux, ARM64]]
os:
[
[self-hosted, linux, X64],
[macos-13],
[self-hosted, macOS, ARM64],
[self-hosted, linux, ARM64],
]
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v4
- uses: cachix/install-nix-action@v30
with:
extra_nix_config: |
access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
- uses: cachix/cachix-action@v15
with:
name: devenv
authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
- id: build
run: |
bin=$(nix build --print-out-paths)
echo "bin=$bin" >> $GITHUB_OUTPUT
- name: Run tests
run: ./result/bin/devenv test
- uses: actions/checkout@v4
- uses: cachix/install-nix-action@v30
with:
extra_nix_config: |
access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
- uses: cachix/cachix-action@v15
with:
name: devenv
authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
- id: build
run: |
bin=$(nix build --print-out-paths)
echo "bin=$bin" >> $GITHUB_OUTPUT
- name: Run tests
run: ./result/bin/devenv test

tests:
needs: build
strategy:
fail-fast: false
matrix:
os: [[self-hosted, linux, X64], [macos-13], [self-hosted, macOS, ARM64], [self-hosted, linux, ARM64]]
os:
[
[self-hosted, linux, X64],
[macos-13],
[self-hosted, macOS, ARM64],
[self-hosted, linux, ARM64],
]
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v4
- uses: cachix/install-nix-action@v30
with:
extra_nix_config: |
access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
- uses: cachix/cachix-action@v15
with:
name: devenv
authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
- name: Build devenv
run: |
nix build
echo "$PWD/result/bin" >> $GITHUB_PATH
- name: Run devenv-test-cli
run: devenv shell devenv-test-cli
- name: Run tests
run: devenv-run-tests tests
- uses: actions/checkout@v4
- uses: cachix/install-nix-action@v30
with:
extra_nix_config: |
access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
- uses: cachix/cachix-action@v15
with:
name: devenv
authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
- name: Build devenv
run: |
nix build
echo "$PWD/result/bin" >> $GITHUB_PATH
- name: Run devenv-test-cli
run: devenv shell devenv-test-cli
- name: Run tests
run: devenv-run-tests tests

pin:
needs: build
Expand All @@ -69,95 +81,114 @@ jobs:
outputs:
examples: ${{ steps.set-examples.outputs.examples }}
steps:
- name: Checkout base repo
uses: actions/checkout@v4
- name: Fetch examples to run
id: set-examples
run: |
json=$(nix shell nixpkgs#tree -c tree -J -L 1 examples | nix shell nixpkgs#jq -c jq -c '[.[0].contents[] | .name]')
echo "examples=$json" >> $GITHUB_OUTPUT
- name: Checkout base repo
uses: actions/checkout@v4
- name: Fetch examples to run
id: set-examples
run: |
set -euxo pipefail
json=$(nix shell nixpkgs#tree -c tree -J -L 1 examples | nix shell nixpkgs#jq -c jq -c '[.[0].contents[] | .name]')
echo "examples=$json" >> $GITHUB_OUTPUT

examples:
name: ${{ matrix.example }} (${{ join(matrix.os) }})
needs: [generate-examples, build]
strategy:
fail-fast: false
matrix:
os: [[self-hosted, linux, X64], [macos-13], [self-hosted, macOS, ARM64], [self-hosted, linux, ARM64]]
os:
[
[self-hosted, linux, X64],
[macos-13],
[self-hosted, macOS, ARM64],
[self-hosted, linux, ARM64],
]
example: ${{ fromJSON(needs.generate-examples.outputs.examples) }}
runs-on: ${{ matrix.os }}
steps:
- run: sudo rm -rf /opt&
- uses: actions/checkout@v4
- uses: cachix/install-nix-action@v30
with:
extra_nix_config: |
access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
- uses: cachix/cachix-action@v15
with:
name: devenv
authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
- name: Build devenv
run: |
nix build
echo "$PWD/result/bin" >> $GITHUB_PATH
- name: Run examples
run: devenv-run-tests --only ${{ matrix.example }} examples
- run: sudo rm -rf /opt&
- uses: actions/checkout@v4
- uses: cachix/install-nix-action@v30
with:
extra_nix_config: |
access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
- uses: cachix/cachix-action@v15
with:
name: devenv
authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
- name: Build devenv
run: |
nix build
echo "$PWD/result/bin" >> $GITHUB_PATH
- name: Run examples
run: devenv-run-tests --only ${{ matrix.example }} examples

direnv:
name: direnv (${{ join(matrix.os) }})
needs: build
strategy:
fail-fast: false
matrix:
os: [[ubuntu-latest], [macos-13], [self-hosted, macOS, ARM64], [self-hosted, Linux, ARM64]]
os:
[
[ubuntu-latest],
[macos-13],
[self-hosted, macOS, ARM64],
[self-hosted, Linux, ARM64],
]
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v4
- uses: cachix/install-nix-action@v30
with:
nix_path: nixpkgs=channel:nixos-unstable
- uses: cachix/cachix-action@v15
with:
name: devenv
authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
- name: Build devenv
run: |
nix build
echo "$PWD/result/bin" >> $GITHUB_PATH
- run: |
mkdir -p ~/.config/direnv/
cat > ~/.config/direnv/direnv.toml << 'EOF'
[global]
strict_env = true
EOF
- uses: actions/checkout@v4
- uses: cachix/install-nix-action@v30
with:
nix_path: nixpkgs=channel:nixos-unstable
- uses: cachix/cachix-action@v15
with:
name: devenv
authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
- name: Build devenv
run: |
nix build
echo "$PWD/result/bin" >> $GITHUB_PATH
- run: |
mkdir -p ~/.config/direnv/
cat > ~/.config/direnv/direnv.toml << 'EOF'
[global]
strict_env = true
EOF

devenv_dir=$PWD
tmp="$(mktemp -d)"
pushd "$tmp"
nix shell nixpkgs#direnv -c devenv --override-input devenv path:$devenv_dir?dir=src/modules init
popd
devenv_dir=$PWD
tmp="$(mktemp -d)"
pushd "$tmp"
nix shell nixpkgs#direnv -c devenv --override-input devenv path:$devenv_dir?dir=src/modules init
popd

fish-zsh:
name: zsh/fish (${{ join(matrix.os) }})
needs: build
strategy:
fail-fast: false
matrix:
os: [[ubuntu-latest], [macos-13], [self-hosted, macOS, ARM64], [self-hosted, linux, ARM64]]
os:
[
[ubuntu-latest],
[macos-13],
[self-hosted, macOS, ARM64],
[self-hosted, linux, ARM64],
]
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v4
- uses: cachix/install-nix-action@v30
with:
nix_path: nixpkgs=channel:nixos-unstable
- uses: cachix/cachix-action@v15
with:
name: devenv
authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
- name: Build devenv
run: nix build
- name: Test devenv in fish and zsh
run: |
nix shell nixpkgs#zsh -c zsh -c "./result/bin/devenv version"
nix shell nixpkgs#fish -c fish -c "./result/bin/devenv version"
- uses: actions/checkout@v4
- uses: cachix/install-nix-action@v30
with:
nix_path: nixpkgs=channel:nixos-unstable
- uses: cachix/cachix-action@v15
with:
name: devenv
authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
- name: Build devenv
run: nix build
- name: Test devenv in fish and zsh
run: |
nix shell nixpkgs#zsh -c zsh -c "./result/bin/devenv version"
nix shell nixpkgs#fish -c fish -c "./result/bin/devenv version"
34 changes: 17 additions & 17 deletions devenv.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@
"flake-compat": {
"flake": false,
"locked": {
"lastModified": 1696426674,
"lastModified": 1732722421,
"owner": "edolstra",
"repo": "flake-compat",
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
"rev": "9ed2ac151eada2306ca8c418ebd97807bb08f6ac",
"type": "github"
},
"original": {
Expand All @@ -31,10 +31,10 @@
"flake-compat_2": {
"flake": false,
"locked": {
"lastModified": 1696426674,
"lastModified": 1732722421,
"owner": "edolstra",
"repo": "flake-compat",
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
"rev": "9ed2ac151eada2306ca8c418ebd97807bb08f6ac",
"type": "github"
},
"original": {
Expand Down Expand Up @@ -73,10 +73,10 @@
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
"lastModified": 1730302582,
"lastModified": 1732021966,
"owner": "cachix",
"repo": "git-hooks.nix",
"rev": "af8a16fe5c264f5e9e18bcee2859b40a656876cf",
"rev": "3308484d1a443fc5bc92012435d79e80458fe43c",
"type": "github"
},
"original": {
Expand Down Expand Up @@ -108,10 +108,10 @@
"libgit2": {
"flake": false,
"locked": {
"lastModified": 1730231647,
"lastModified": 1732660327,
"owner": "libgit2",
"repo": "libgit2",
"rev": "c6111ec06cc0b0126cd67bdab78f8091e4cfaa10",
"rev": "c86842f0a518cc15d7964027d01a4ae3bf9604db",
"type": "github"
},
"original": {
Expand Down Expand Up @@ -146,10 +146,10 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1730665687,
"lastModified": 1732887538,
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "df9782b6077321330159a0ad8902d879f093d7c1",
"rev": "2e212b2e1fad641d3721f8b1b530747ff4287905",
"type": "github"
},
"original": {
Expand Down Expand Up @@ -191,10 +191,10 @@
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1730327045,
"lastModified": 1732749044,
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "080166c15633801df010977d9d7474b4a6c549d7",
"rev": "0c5b4ecbed5b155b705336aa96d878e55acd8685",
"type": "github"
},
"original": {
Expand All @@ -206,15 +206,15 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1716977621,
"lastModified": 1732780316,
"owner": "cachix",
"repo": "devenv-nixpkgs",
"rev": "4267e705586473d3e5c8d50299e71503f16a6fb6",
"rev": "226216574ada4c3ecefcbbec41f39ce4655f78ef",
"type": "github"
},
"original": {
"owner": "cachix",
"ref": "rolling",
"ref": "bump-rolling",
"repo": "devenv-nixpkgs",
"type": "github"
}
Expand All @@ -237,10 +237,10 @@
]
},
"locked": {
"lastModified": 1730302582,
"lastModified": 1732021966,
"owner": "cachix",
"repo": "pre-commit-hooks.nix",
"rev": "af8a16fe5c264f5e9e18bcee2859b40a656876cf",
"rev": "3308484d1a443fc5bc92012435d79e80458fe43c",
"type": "github"
},
"original": {
Expand Down
Loading
Loading