Skip to content

Commit

Permalink
Update dependencies and documentation
Browse files Browse the repository at this point in the history
  • Loading branch information
Sukant Hajra committed Jul 15, 2024
1 parent 0e20d5c commit 043adc6
Show file tree
Hide file tree
Showing 7 changed files with 33 additions and 41 deletions.
2 changes: 0 additions & 2 deletions doc/nix-installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,6 @@ For each substituter we use, we need to also configure Nix to trust their public

When editing the `/etc/nix/nix.conf` as root, suffix the new substituter(s), space-separated to any values already populating the `substituters` parameter.

Note, the order of the substituters indicates the order in which caches are searched. Leave the <https://cache.nixos.org> substituter first to maximize cache hits.

Next, similarly suffix the key(s) to the `trusted-public-keys` parameter.

Your file will likely look like the following:
Expand Down
4 changes: 0 additions & 4 deletions doc/nix-installation.org
Original file line number Diff line number Diff line change
Expand Up @@ -133,10 +133,6 @@ keys:
When editing the =/etc/nix/nix.conf= as root, suffix the new substituter(s),
space-separated to any values already populating the =substituters= parameter.

Note, the order of the substituters indicates the order in which caches are
searched. Leave the https://cache.nixos.org substituter first to maximize cache
hits.

Next, similarly suffix the key(s) to the =trusted-public-keys= parameter.

Your file will likely look like the following:
Expand Down
2 changes: 0 additions & 2 deletions doc/nix-usage-flakes.md
Original file line number Diff line number Diff line change
Expand Up @@ -185,8 +185,6 @@ nix search .

* packages.x86_64-linux.org2gfm
Script to export Org-mode files to GitHub Flavored Markdown (GFM)

* legacyPackages.x86_64-linux.ci

If a flake has a lot of packages, you can pass regexes to prune down the search. Returned values will match all the regexes provided.

Expand Down
2 changes: 0 additions & 2 deletions doc/nix-usage-flakes.org
Original file line number Diff line number Diff line change
Expand Up @@ -304,8 +304,6 @@ nix search . | ansifilter
:
: * packages.x86_64-linux.org2gfm
: Script to export Org-mode files to GitHub Flavored Markdown (GFM)
:
: * legacyPackages.x86_64-linux.ci

If a flake has a lot of packages, you can pass regexes to prune down the search.
Returned values will match all the regexes provided.
Expand Down
23 changes: 12 additions & 11 deletions doc/nix-usage-noflakes.md
Original file line number Diff line number Diff line change
Expand Up @@ -80,13 +80,13 @@ We can use an `--extra-experimental-features nix-command` switch to use an exper
nix --extra-experimental-features nix-command search --file . ''
```

* legacyPackages.aarch64-darwin.ci

* legacyPackages.x86_64-darwin.ci
* packages.aarch64-darwin.nix-scaffold
Script to scaffold a Nix project

* legacyPackages.x86_64-linux.ci
* packages.aarch64-darwin.org2gfm
Script to export Org-mode files to GitHub Flavored Markdown (GFM)

* packages.aarch64-darwin.nix-scaffold
* packages.x86_64-darwin.nix-scaffold
Script to scaffold a Nix project

Expand Down Expand Up @@ -119,14 +119,14 @@ nix --extra-experimental-features \
```

{
"legacyPackages.aarch64-darwin.ci": {
"description": "",
"pname": "nix-project-ci",
"packages.aarch64-darwin.nix-scaffold": {
"description": "Script to scaffold a Nix project",
"pname": "nix-scaffold",
"version": ""
},
"legacyPackages.x86_64-darwin.ci": {
"description": "",
"pname": "nix-project-ci",
"packages.aarch64-darwin.org2gfm": {
"description": "Script to export Org-mode files to GitHub Flavored Markdown (GFM)",
"pname": "org2gfm",

Additional data includes the package's name (from the “pname” field), a version string, and a textual description of the package.
Expand Down Expand Up @@ -305,6 +305,7 @@ nix-env --install --file . --attr packages.x86_64-linux.org2gfm 2>&1
```

installing 'org2gfm'
building '/nix/store/hs9xz17vlb2m4qn6kxfmccgjq4jyrvqg-user-environment.drv'...

We can see this installation by querying what's been installed:

Expand Down
23 changes: 12 additions & 11 deletions doc/nix-usage-noflakes.org
Original file line number Diff line number Diff line change
Expand Up @@ -171,13 +171,13 @@ nix --experimental-features nix-command search --file . '' | ansifilter

#+RESULTS: nix-search-local
#+begin_example
,* legacyPackages.aarch64-darwin.ci

,* legacyPackages.x86_64-darwin.ci
,* packages.aarch64-darwin.nix-scaffold
Script to scaffold a Nix project

,* legacyPackages.x86_64-linux.ci
,* packages.aarch64-darwin.org2gfm
Script to export Org-mode files to GitHub Flavored Markdown (GFM)

,* packages.aarch64-darwin.nix-scaffold
,* packages.x86_64-darwin.nix-scaffold
Script to scaffold a Nix project

Expand Down Expand Up @@ -235,14 +235,14 @@ nix --experimental-features \
#+RESULTS: nix-search-json
#+begin_example
{
"legacyPackages.aarch64-darwin.ci": {
"description": "",
"pname": "nix-project-ci",
"packages.aarch64-darwin.nix-scaffold": {
"description": "Script to scaffold a Nix project",
"pname": "nix-scaffold",
"version": ""
},
"legacyPackages.x86_64-darwin.ci": {
"description": "",
"pname": "nix-project-ci",
"packages.aarch64-darwin.org2gfm": {
"description": "Script to export Org-mode files to GitHub Flavored Markdown (GFM)",
"pname": "org2gfm",
#+end_example

Expand Down Expand Up @@ -557,6 +557,7 @@ nix-env --profile /tmp/nix-profile \

#+RESULTS: nix-env-install
: installing 'org2gfm'
: building '/nix/store/hs9xz17vlb2m4qn6kxfmccgjq4jyrvqg-user-environment.drv'...

We can see this installation by querying what's been installed:

Expand Down
18 changes: 9 additions & 9 deletions flake.lock

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

0 comments on commit 043adc6

Please sign in to comment.