Skip to content

Commit

Permalink
Correct some places the version got out of sync (#109)
Browse files Browse the repository at this point in the history
There are a bunch of 24.05 → 24.11 changes, but two specific things in
the manual to call out:

1. the version was listed as matching Nixpkgs, but Project Manager uses
a distinct SemVer instead; and
2. the instructions for standalone setup were just wrong, and so have
been updated to at least be _less_ wrong.
  • Loading branch information
sellout authored Jan 7, 2025
2 parents 8feff89 + ca86a17 commit 80a5bae
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 21 deletions.
5 changes: 3 additions & 2 deletions .config/project/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,9 @@
"22_11"
"23_05"
"23_11"
# "24_05" # tested, but covered by the Project Manager build
"24_11"
"24_05"
"24_11" # tested, but covered by the Project Manager build
"25_05"
];
in {
project = {
Expand Down
2 changes: 1 addition & 1 deletion .github/settings.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/manual/manual.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Project Manager Manual {#project-manager-manual}

## Version 24.05 (unstable)
## Version 0.7.0 (unstable)

```{=include=} preface
preface.md
Expand Down
19 changes: 5 additions & 14 deletions docs/manual/nix-flakes/standalone.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,10 @@ To prepare an initial Project Manager configuration for your logged in
user, you can run the Project Manager `init` command directly from its
flake.

For example, if you are using the unstable version of Nixpkgs or NixOS,
then to generate and activate a basic configuration run the command
For example, to generate and activate a basic configuration run the command

```shell
$ nix run project-manager/master -- init --switch
```

For Nixpkgs or NixOS version 24.05 run

```shell
$ nix run project-manager/release-24.05 -- init --switch
$ nix run github:sellout/project-manager -- init --switch
```

This will generate a `flake.nix` and a `default.nix` file in
Expand All @@ -25,13 +18,11 @@ This is useful if you want to inspect and edit the configuration before
activating it.

```shell
$ nix run project-manager/$branch -- init
$ nix run github:sellout/project-manager -- init
$ # Edit files in ~/.config/project-manager
$ nix run project-manager/$branch -- init --switch
$ nix run github:sellout/project-manager -- init --switch
```

Where `$branch` is one of `master` or `release-24.05`.

After the initial activation has completed successfully then building
and activating your flake-based configuration is as simple as

Expand All @@ -43,7 +34,7 @@ It’s possible to override the default configuration directory, if you
want. For example,

```shell
$ nix run project-manager/$branch -- init --switch ~/hmconf
$ nix run github:sellout/project-manager -- init --switch ~/hmconf
$ # And after the initial activation.
$ project-manager switch --flake ~/hmconf
```
Expand Down
2 changes: 1 addition & 1 deletion docs/manual/quick-start/existing-project.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ At a minimum, you need to have
inputs = {
# NB: This version doesn’t have to be current, Project Manager supports many
# older Nixpkgs releases as well as unstable (as much as is possible).
nixpkgs.url = "github:NixOS/nixpkgs/release-24.05";
nixpkgs.url = "github:NixOS/nixpkgs/release-24.11";
project-manager.url = "github:sellout/project-manager";
}
}
Expand Down
3 changes: 2 additions & 1 deletion lib/bash/project-manager.bash
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,8 @@ function pm_listPackagesBySuffix() {

function pm_removePackagesBySuffix() {
pm_listPackagesBySuffix "$1" "$2" \
| xargs "${VERBOSE_ARG[@]}" "${DRY_RUN_CMD[@]}" nix profile remove "${VERBOSE_ARG[@]}" --profile "$1"
| xargs "${VERBOSE_ARG[@]}" "${DRY_RUN_CMD[@]}" --no-run-if-empty \
nix profile remove "${VERBOSE_ARG[@]}" --profile "$1"
}

function setNixProfileCommands() {
Expand Down
2 changes: 1 addition & 1 deletion templates/default/flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
inputs = {
flake-utils.url = "github:numtide/flake-utils";

nixpkgs.url = "github:nixos/nixpkgs/release-24.05";
nixpkgs.url = "github:nixos/nixpkgs/release-24.11";

project-manager = {
url = "github:sellout/project-manager";
Expand Down

0 comments on commit 80a5bae

Please sign in to comment.