Skip to content

Commit 1351bfa

Browse files
authored
fix: update to 1.11.1 + python.withPackages (#19)
1 parent 79c4e47 commit 1351bfa

13 files changed

Lines changed: 296 additions & 251 deletions

File tree

README.md

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ Authors:
5454

5555
# What Is This?
5656

57-
This is a repository template giving you a top-level structure with the
58-
following features.
57+
This repo renders **repository templates** for different languages giving you a
58+
top-level structure with the following features.
5959

6060
- **Git & Git Large File System (LFS)** configured.
6161
- **Nix development shell** enabled with [`direnv`](https://direnv.net) and
@@ -72,6 +72,8 @@ following features.
7272

7373
# Usage
7474

75+
To render a new repository for language `<language>` you can use
76+
7577
## Over Container
7678

7779
```bash
@@ -92,7 +94,7 @@ See [arguments explanations here](#arguments).
9294
9395
## By Cloning
9496
95-
Clone this repository to some place of your choice.
97+
You can also clone this repository to some place of your choice.
9698
9799
Apply the templates with `copier` using the following:
98100
@@ -181,7 +183,7 @@ The following describes the content of the top-level directories:
181183
182184
[Source](src/go/tools/nix/shells/toolchain-go.nix)
183185
184-
- Compiler: `go` at `1.23.X`
186+
- Compiler: `go` at `1.24.X`
185187
- Build-Tool: `go`
186188
- LSP: `gopls`
187189
- Formatter: `gofmt`, `goimports`, `golines`
@@ -195,7 +197,7 @@ The following describes the content of the top-level directories:
195197
- [Source](src/python/tools/nix/shells/toolchain-python.nix)
196198
- [Demo Rendering](https://github.com/sdsc-ordes/repository-template-python)
197199
198-
- Interpreter: `python` at `3.12`
200+
- Interpreter: `python` at `3.13`
199201
- Build-Tool: `uv`
200202
- LSP: `pyright`
201203
- Formatter: `ruff`

src/generic/tools/ci/general.sh

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,6 @@ function ci::setup_python_venv() {
6666
local root_dir
6767
root_dir=$(git rev-parse --show-toplevel)
6868

69-
# If VIRTUAL_ENV is set use it.
70-
export VIRTUAL_ENV="${VIRTUAL_ENV:-$root_dir/.venv}"
71-
export UV_PROJECT_ENVIRONMENT="$VIRTUAL_ENV"
72-
7369
ci::print_info "Python virtual env. dir '$UV_PROJECT_ENVIRONMENT' set."
7470

7571
if [ ! -d "$UV_PROJECT_ENVIRONMENT" ]; then

src/generic/tools/nix/flake.lock

Lines changed: 45 additions & 44 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/generic/tools/nix/flake.nix.jinja

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
5555

5656
# Nixpkgs (stable NixOS branch)
57-
nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-25.05";
57+
nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-25.11";
5858

5959
# Format the repo with nix-treefmt.
6060
treefmt-nix = {
@@ -65,12 +65,12 @@
6565
# The devenv module to create good development shells.
6666
# The `nixpkgs-devenv` must aligned with the pinned version.
6767
devenv = {
68-
url = "github:cachix/devenv?ref=v1.10";
68+
url = "github:cachix/devenv?ref=v1.11.1";
6969
inputs.nixpkgs.follows = "nixpkgs-devenv";
7070
};
7171
# This is the rolling nixpkgs with what devenv was tested.
7272
nixpkgs-devenv = {
73-
url = "github:cachix/devenv-nixpkgs?ref=207a4cb0e1253c7658c6736becc6eb9cace1f25f";
73+
url = "github:cachix/devenv-nixpkgs?ref=d1c30452ebecfc55185ae6d1c983c09da0c274ff";
7474
};
7575

7676
# To build a base image with Nix.

0 commit comments

Comments
 (0)