Skip to content

Commit f8b9b5a

Browse files
committed
Nixpkgs is now Botpkgs
1 parent 4e4c898 commit f8b9b5a

File tree

1,354 files changed

+9594
-9611
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,354 files changed

+9594
-9611
lines changed

.editorconfig

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# EditorConfig configuration for nixpkgs
1+
# EditorConfig configuration for botpkgs
22
# https://EditorConfig.org
33

44
# Top-most EditorConfig file
@@ -17,7 +17,7 @@ end_of_line = unset
1717
insert_final_newline = unset
1818
trim_trailing_whitespace = unset
1919

20-
# see https://nixos.org/nixpkgs/manual/#chap-conventions
20+
# see https://nixos.org/botpkgs/manual/#chap-conventions
2121

2222
# Match json/lockfiles/markdown/nix/perl/python/ruby/shell/docbook files, set indent to spaces
2323
[*.{json,lock,md,nix,pl,pm,py,rb,sh,xml}]
@@ -56,7 +56,7 @@ trim_trailing_whitespace = unset
5656
indent_size = unset
5757

5858
# Although Markdown/CommonMark allows using two trailing spaces to denote
59-
# a hard line break, we do not use that feature in nixpkgs since
59+
# a hard line break, we do not use that feature in botpkgs since
6060
# it forces the surrounding paragraph to become a <literallayout> which
6161
# does not wrap reasonably.
6262
# Instead of a hard line break, start a new paragraph by inserting a blank line.

.github/CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
/pkgs/pkgs-lib/formats/libconfig @ckiee @h7x4
5555

5656
# pkgs/by-name
57-
/pkgs/test/nixpkgs-check-by-name @infinisil
57+
/pkgs/test/botpkgs-check-by-name @infinisil
5858
/pkgs/by-name/README.md @infinisil
5959
/pkgs/top-level/by-name-overlay.nix @infinisil
6060
/.github/workflows/check-by-name.yml @infinisil

.github/ISSUE_TEMPLATE/missing_documentation.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@ assignees: ''
1919

2020
<!-- make sure this issue is not redundant or obsolete -->
2121

22-
- [ ] checked [latest Botpkgs manual] \([source][nixpkgs-source]) and [latest Botnix manual] \([source][nixos-source])
22+
- [ ] checked [latest Botpkgs manual] \([source][botpkgs-source]) and [latest Botnix manual] \([source][nixos-source])
2323
- [ ] checked [open documentation issues] for possible duplicates
2424
- [ ] checked [open documentation pull requests] for possible solutions
2525

26-
[latest Botpkgs manual]: https://nixos.org/manual/nixpkgs/unstable/
26+
[latest Botpkgs manual]: https://nixos.org/manual/botpkgs/unstable/
2727
[latest Botnix manual]: https://nixos.org/manual/nixos/unstable/
28-
[nixpkgs-source]: https://github.com/nervosys/Botnix/tree/master/doc
28+
[botpkgs-source]: https://github.com/nervosys/Botnix/tree/master/doc
2929
[nixos-source]: https://github.com/nervosys/Botnix/tree/master/nixos/doc/manual
3030
[open documentation issues]: https://github.com/nervosys/Botnix/issues?q=is%3Aissue+is%3Aopen+label%3A%229.needs%3A+documentation%22
3131
[open documentation pull requests]: https://github.com/nervosys/Botnix/pulls?q=is%3Aopen+is%3Apr+label%3A%228.has%3A+documentation%22%2C%226.topic%3A+documentation%22

.github/ISSUE_TEMPLATE/out_of_date_package_report.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Type the name of your package and try to find an open pull request for the packa
1717
If you find an open pull request, you can review it!
1818
There's a high chance that you'll have the new version right away while helping the community!
1919
-->
20-
- [ ] Checked the [nixpkgs pull requests](https://github.com/nervosys/Botnix/pulls)
20+
- [ ] Checked the [botpkgs pull requests](https://github.com/nervosys/Botnix/pulls)
2121

2222
**Notify maintainers**
2323

.github/ISSUE_TEMPLATE/unreproducible_package.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,13 @@ to keep the build artifacts so we can compare them in case of differences.
4444
Execute the following command:
4545

4646
```
47-
nix-build '<nixpkgs>' -A <package> && nix-build '<nixpkgs>' -A <package> --check --keep-failed
47+
nix-build '<botpkgs>' -A <package> && nix-build '<botpkgs>' -A <package> --check --keep-failed
4848
```
4949

5050
Or using the new command line style:
5151

5252
```
53-
nix build nixpkgs#<package> && nix build nixpkgs#<package> --rebuild --keep-failed
53+
nix build botpkgs#<package> && nix build botpkgs#<package> --rebuild --keep-failed
5454
```
5555

5656
#### 2. Compare the build artifacts
@@ -64,21 +64,21 @@ the discrepancies between the two build outputs. You may need to add the
6464
metadata (*e.g. timestamp*) differences.
6565

6666
```
67-
nix run nixpkgs#diffoscopeMinimal -- --exclude-directory-metadata recursive <Y> <Z>
67+
nix run botpkgs#diffoscopeMinimal -- --exclude-directory-metadata recursive <Y> <Z>
6868
```
6969

7070
#### 3. Examine the build log
7171

7272
To examine the build log, use:
7373

7474
```
75-
nix-store --read-log $(nix-instantiate '<nixpkgs>' -A <package>)
75+
nix-store --read-log $(nix-instantiate '<botpkgs>' -A <package>)
7676
```
7777

7878
Or with the new command line style:
7979

8080
```
81-
nix log $(nix path-info --derivation nixpkgs#<package>)
81+
nix log $(nix path-info --derivation botpkgs#<package>)
8282
```
8383

8484
### Additional context

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ For new packages please briefly describe the package or provide a link to its ho
1919
- [ ] `sandbox = true`
2020
- [ ] Tested, as applicable:
2121
- [Botnix test(s)](https://nixos.org/manual/nixos/unstable/index.html#sec-nixos-tests) (look inside [nixos/tests](https://github.com/nervosys/Botnix/blob/master/nixos/tests))
22-
- and/or [package tests](https://nixos.org/manual/nixpkgs/unstable/#sec-package-tests)
22+
- and/or [package tests](https://nixos.org/manual/botpkgs/unstable/#sec-package-tests)
2323
- or, for functions and "core" functionality, tests in [lib/tests](https://github.com/nervosys/Botnix/blob/master/lib/tests) or [pkgs/test](https://github.com/nervosys/Botnix/blob/master/pkgs/test)
24-
- made sure Botnix tests are [linked](https://nixos.org/manual/nixpkgs/unstable/#ssec-nixos-tests-linking) to the relevant packages
25-
- [ ] Tested compilation of all packages that depend on this change using `nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD"`. Note: all changes have to be committed, also see [nixpkgs-review usage](https://github.com/Mic92/nixpkgs-review#usage)
24+
- made sure Botnix tests are [linked](https://nixos.org/manual/botpkgs/unstable/#ssec-nixos-tests-linking) to the relevant packages
25+
- [ ] Tested compilation of all packages that depend on this change using `nix-shell -p botpkgs-review --run "botpkgs-review rev HEAD"`. Note: all changes have to be committed, also see [botpkgs-review usage](https://github.com/Mic92/botpkgs-review#usage)
2626
- [ ] Tested basic functionality of all binary files (usually in `./result/bin/`)
2727
- [24.05 Release Notes](https://github.com/nervosys/Botnix/blob/master/nixos/doc/manual/release-notes/rl-2405.section.md) (or backporting [23.05](https://github.com/nervosys/Botnix/blob/master/nixos/doc/manual/release-notes/rl-2305.section.md) and [23.11](https://github.com/nervosys/Botnix/blob/master/nixos/doc/manual/release-notes/rl-2311.section.md) Release notes)
2828
- [ ] (Package updates) Added a release notes entry if the change is major or breaking
@@ -38,7 +38,7 @@ Reviewing helps to reduce the average time-to-merge for everyone.
3838
Thanks a lot if you do!
3939
4040
List of open PRs: https://github.com/nervosys/Botnix/pulls
41-
Reviewing guidelines: https://nixos.org/manual/nixpkgs/unstable/#chap-reviewing-contributions
41+
Reviewing guidelines: https://nixos.org/manual/botpkgs/unstable/#chap-reviewing-contributions
4242
-->
4343

4444
---

.github/workflows/basic-eval.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ jobs:
2222
- uses: cachix/install-nix-action@6004951b182f8860210c8d6f0d808ec5b1a33d28 # v25
2323
- uses: cachix/cachix-action@18cf96c7c98e048e10a83abd92116114cd8504be # v14
2424
with:
25-
# This cache is for the nixpkgs repo checks and should not be trusted or used elsewhere.
26-
name: nixpkgs-ci
25+
# This cache is for the botpkgs repo checks and should not be trusted or used elsewhere.
26+
name: botpkgs-ci
2727
signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}'
2828
# explicit list of supportedSystems is needed until aarch64-darwin becomes part of the trunk jobset
29-
- run: nix-build pkgs/top-level/release.nix -A tarball.nixpkgs-basic-release-checks --arg supportedSystems '[ "aarch64-darwin" "aarch64-linux" "x86_64-linux" "x86_64-darwin" ]'
29+
- run: nix-build pkgs/top-level/release.nix -A tarball.botpkgs-basic-release-checks --arg supportedSystems '[ "aarch64-darwin" "aarch64-linux" "x86_64-linux" "x86_64-darwin" ]'

.github/workflows/check-by-name.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
# Checks pkgs/by-name (see pkgs/by-name/README.md)
2-
# using the nixpkgs-check-by-name tool (see pkgs/test/nixpkgs-check-by-name)
2+
# using the botpkgs-check-by-name tool (see pkgs/test/botpkgs-check-by-name)
33
#
4-
# When you make changes to this workflow, also update pkgs/test/nixpkgs-check-by-name/scripts/run-local.sh adequately
4+
# When you make changes to this workflow, also update pkgs/test/botpkgs-check-by-name/scripts/run-local.sh adequately
55
name: Check pkgs/by-name
66

77
# The tool is pinned to a pre-built version on Hydra,
8-
# see pkgs/test/nixpkgs-check-by-name/scripts/README.md
8+
# see pkgs/test/botpkgs-check-by-name/scripts/README.md
99
on:
1010
# Using pull_request_target instead of pull_request avoids having to approve first time contributors
1111
pull_request_target:
@@ -100,15 +100,15 @@ jobs:
100100
echo "base=$base" >> "$GITHUB_ENV"
101101
- uses: cachix/install-nix-action@6004951b182f8860210c8d6f0d808ec5b1a33d28 # v25
102102
- name: Fetching the pinned tool
103-
# Update the pinned version using pkgs/test/nixpkgs-check-by-name/scripts/update-pinned-tool.sh
103+
# Update the pinned version using pkgs/test/botpkgs-check-by-name/scripts/update-pinned-tool.sh
104104
run: |
105105
# Get the direct /nix/store path from the pin to avoid having to evaluate Botpkgs
106-
toolPath=$(jq -r '."ci-path"' pkgs/test/nixpkgs-check-by-name/scripts/pinned-tool.json)
106+
toolPath=$(jq -r '."ci-path"' pkgs/test/botpkgs-check-by-name/scripts/pinned-tool.json)
107107
# This asks the substituter for the path, which should be there because Hydra will have pre-built and pushed it
108108
nix-store --realise "$toolPath" --add-root result
109-
- name: Running nixpkgs-check-by-name
109+
- name: Running botpkgs-check-by-name
110110
run: |
111-
if result/bin/nixpkgs-check-by-name --base "$base" .; then
111+
if result/bin/botpkgs-check-by-name --base "$base" .; then
112112
exit 0
113113
else
114114
exitCode=$?

.github/workflows/editorconfig.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ jobs:
3030
ref: refs/pull/${{ github.event.pull_request.number }}/merge
3131
- uses: cachix/install-nix-action@6004951b182f8860210c8d6f0d808ec5b1a33d28 # v25
3232
with:
33-
# nixpkgs commit is pinned so that it doesn't break
33+
# botpkgs commit is pinned so that it doesn't break
3434
# editorconfig-checker 2.4.0
35-
nix_path: nixpkgs=https://github.com/nervosys/Botnix/archive/c473cc8714710179df205b153f4e9fa007107ff9.tar.gz
35+
nix_path: botpkgs=https://github.com/nervosys/Botnix/archive/c473cc8714710179df205b153f4e9fa007107ff9.tar.gz
3636
- name: Checking EditorConfig
3737
run: |
3838
cat "$HOME/changed_files" | nix-shell -p editorconfig-checker --run 'xargs -r editorconfig-checker -disable-indent-size'

.github/workflows/manual-nixos.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ jobs:
2424
extra_nix_config: sandbox = true
2525
- uses: cachix/cachix-action@18cf96c7c98e048e10a83abd92116114cd8504be # v14
2626
with:
27-
# This cache is for the nixpkgs repo checks and should not be trusted or used elsewhere.
28-
name: nixpkgs-ci
27+
# This cache is for the botpkgs repo checks and should not be trusted or used elsewhere.
28+
name: botpkgs-ci
2929
signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}'
3030
- name: Building Botnix manual
31-
run: NIX_PATH=nixpkgs=$(pwd) nix-build --option restrict-eval true botnix/release.nix -A manual.x86_64-linux
31+
run: NIX_PATH=botpkgs=$(pwd) nix-build --option restrict-eval true botnix/release.nix -A manual.x86_64-linux

0 commit comments

Comments
 (0)