Skip to content

Commit

Permalink
CAKE: Fix X.org
Browse files Browse the repository at this point in the history
  • Loading branch information
Sukant Hajra committed Dec 12, 2024
1 parent 608e5a8 commit 4592d2d
Show file tree
Hide file tree
Showing 7 changed files with 91 additions and 102 deletions.
2 changes: 1 addition & 1 deletion doc/nix-introduction.md
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ Nix addresses all the problems discussed above.

To build or install any project, we should be able to start with only the Nix package manager installed. No other library or system dependency should be required to be installed or configured.

Even if we have a library or system dependency installed, it shouldn't interfere with any build or installation we want to do. Nix builds and installs in its own directories.
Even if we have a library or system dependency installed, it shouldn't interfere with any build or installation we want to do. Nix builds and installs in its own meticulously sandboxed and controlled directories.

Our build should get everything we need, all the way down to the system-level dependencies, irrespective of which programming language the dependencies have been authored in. If anything has been pre-built, we should download a cached result.

Expand Down
2 changes: 1 addition & 1 deletion doc/nix-introduction.org
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ required to be installed or configured.

Even if we have a library or system dependency installed, it shouldn't interfere
with any build or installation we want to do. Nix builds and installs in its own
directories.
meticulously sandboxed and controlled directories.

Our build should get everything we need, all the way down to the system-level
dependencies, irrespective of which programming language the dependencies have
Expand Down
12 changes: 6 additions & 6 deletions doc/nix-usage-flakes.md
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ After a successful call of `nix build`, you'll see one or more symlinks for each
readlink result*
```

/nix/store/h2z1cf5500q3zp2b14klycgls6kg1zkx-home-manager
/nix/store/8pnj3i5yxz8zrsqzjr6ljpxi0n0010m4-home-manager

Following these symlinks, we can see the files the project provides:

Expand Down Expand Up @@ -300,7 +300,7 @@ It's common to configure these “result” symlinks as ignored in source contro
nix path-info .#home-manager
```

/nix/store/h2z1cf5500q3zp2b14klycgls6kg1zkx-home-manager
/nix/store/8pnj3i5yxz8zrsqzjr6ljpxi0n0010m4-home-manager

## Running commands in a shell<a id="sec-4-6"></a>

Expand All @@ -316,7 +316,7 @@ nix shell \
--command home-manager --help
```

Usage: /nix/store/h2z1cf5500q3zp2b14klycgls6kg1zkx-home-manager/bin/home-manager [OPTION] COMMAND
Usage: /nix/store/8pnj3i5yxz8zrsqzjr6ljpxi0n0010m4-home-manager/bin/home-manager [OPTION] COMMAND

Options

Expand Down Expand Up @@ -366,7 +366,7 @@ Here's the `nix run` equivalent of the `nix shell` invocation from the previous
nix run .#home-manager -- --help
```

Usage: /nix/store/h2z1cf5500q3zp2b14klycgls6kg1zkx-home-manager/bin/home-manager [OPTION] COMMAND
Usage: /nix/store/8pnj3i5yxz8zrsqzjr6ljpxi0n0010m4-home-manager/bin/home-manager [OPTION] COMMAND

Options

Expand Down Expand Up @@ -413,7 +413,7 @@ nix shell --ignore-environment \
--command which home-manager
```

/nix/store/h2z1cf5500q3zp2b14klycgls6kg1zkx-home-manager/bin/home-manager
/nix/store/8pnj3i5yxz8zrsqzjr6ljpxi0n0010m4-home-manager/bin/home-manager

What we do with local flake references can work just as well with remote flake references.

Expand Down Expand Up @@ -441,7 +441,7 @@ nix profile list
Flake attribute: packages.x86_64-linux.home-manager
Original flake URL: git+file:///home/shajra/src/shajra-provisioning
Locked flake URL: git+file:///home/shajra/src/shajra-provisioning
Store paths: /nix/store/h2z1cf5500q3zp2b14klycgls6kg1zkx-home-manager
Store paths: /nix/store/8pnj3i5yxz8zrsqzjr6ljpxi0n0010m4-home-manager

If we want to uninstall a program from our profile, we can reference it by name:

Expand Down
12 changes: 6 additions & 6 deletions doc/nix-usage-flakes.org
Original file line number Diff line number Diff line change
Expand Up @@ -448,7 +448,7 @@ readlink result*
#+end_src

#+RESULTS: nix-build-link
: /nix/store/h2z1cf5500q3zp2b14klycgls6kg1zkx-home-manager
: /nix/store/8pnj3i5yxz8zrsqzjr6ljpxi0n0010m4-home-manager

Following these symlinks, we can see the files the project provides:

Expand Down Expand Up @@ -485,7 +485,7 @@ nix path-info .#<<get("package-attr-short")>>
#+end_src

#+results: nix-build-path
: /nix/store/h2z1cf5500q3zp2b14klycgls6kg1zkx-home-manager
: /nix/store/8pnj3i5yxz8zrsqzjr6ljpxi0n0010m4-home-manager

** Running commands in a shell

Expand All @@ -509,7 +509,7 @@ nix shell \
#+end_src

#+RESULTS: nix-shell
: Usage: /nix/store/h2z1cf5500q3zp2b14klycgls6kg1zkx-home-manager/bin/home-manager [OPTION] COMMAND
: Usage: /nix/store/8pnj3i5yxz8zrsqzjr6ljpxi0n0010m4-home-manager/bin/home-manager [OPTION] COMMAND
:
: Options
:
Expand Down Expand Up @@ -583,7 +583,7 @@ nix run .#<<get("run-attr-short")>> -- --help
#+end_src

#+RESULTS: nix-run
: Usage: /nix/store/h2z1cf5500q3zp2b14klycgls6kg1zkx-home-manager/bin/home-manager [OPTION] COMMAND
: Usage: /nix/store/8pnj3i5yxz8zrsqzjr6ljpxi0n0010m4-home-manager/bin/home-manager [OPTION] COMMAND
:
: Options
:
Expand Down Expand Up @@ -647,7 +647,7 @@ nix shell --ignore-environment \
#+end_src

#+RESULTS: nix-shell-remote
: /nix/store/h2z1cf5500q3zp2b14klycgls6kg1zkx-home-manager/bin/home-manager
: /nix/store/8pnj3i5yxz8zrsqzjr6ljpxi0n0010m4-home-manager/bin/home-manager

What we do with local flake references can work just as well with remote flake
references.
Expand Down Expand Up @@ -698,7 +698,7 @@ nix profile list --profile /tmp/nix-profile | ansifilter
: Flake attribute: packages.x86_64-linux.home-manager
: Original flake URL: git+file:///home/shajra/src/shajra-provisioning
: Locked flake URL: git+file:///home/shajra/src/shajra-provisioning
: Store paths: /nix/store/h2z1cf5500q3zp2b14klycgls6kg1zkx-home-manager
: Store paths: /nix/store/8pnj3i5yxz8zrsqzjr6ljpxi0n0010m4-home-manager

If we want to uninstall a program from our profile, we can reference it by name:

Expand Down
Loading

0 comments on commit 4592d2d

Please sign in to comment.