diff options
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | default.nix | 5 | ||||
| -rw-r--r-- | nix/nint/OWNERS | 3 | ||||
| -rw-r--r-- | nix/nint/README.md (renamed from users/sterni/nint/README.md) | 0 | ||||
| -rw-r--r-- | nix/nint/default.nix (renamed from users/sterni/nint/default.nix) | 0 | ||||
| -rw-r--r-- | nix/nint/nint.rs (renamed from users/sterni/nint/nint.rs) | 0 | ||||
| -rw-r--r-- | web/bubblegum/README.md | 2 | ||||
| -rw-r--r-- | web/bubblegum/default.nix | 3 |
8 files changed, 7 insertions, 8 deletions
diff --git a/README.md b/README.md index 535275b10fa4..5741ef8ebcd9 100644 --- a/README.md +++ b/README.md @@ -58,6 +58,7 @@ configuration is tracked in `//ops/{modules,machines}`. software. Currently only SBCL is supported. Lisp programs in this repository are built using this library. * `//web/bubblegum` contains a CGI-based web framework written in Nix. +* `//nix/nint`: A shebang-compatible interpreter wrapper for Nix. * `//tvix` contains initial work towards a modular architecture for Nix. * `//third_party/nix` contains [our fork][tvix] of the Nix package manager. @@ -88,7 +89,6 @@ Some examples: [tazj.in](https://tazj.in) * `//users/grfn/xanthous`: A (WIP) TUI RPG, written in Haskell. * `//users/tazjin/emacs`: tazjin's Emacs & EXWM configuration -* `//users/sterni/nint`: A shebang-compatible interpreter wrapper for Nix. * `//users/tazjin/finito`: A persistent finite-state machine library for Rust. # Licensing diff --git a/default.nix b/default.nix index 77fb4ae544b7..866b3fa6bfe9 100644 --- a/default.nix +++ b/default.nix @@ -34,11 +34,6 @@ let # TODO(tazjin): Can this one be removed somehow? [ "ops" "nixos" ] [ "ops" "machines" "all-systems" ] - - # //web/bubblegum has examples using //users/sterni, they should - # probably be in the user folder instead with a link there. - # TODO(sterni): Clean this up. - [ "web" "bubblegum" ] ] then args else args // { diff --git a/nix/nint/OWNERS b/nix/nint/OWNERS new file mode 100644 index 000000000000..f16dd105d761 --- /dev/null +++ b/nix/nint/OWNERS @@ -0,0 +1,3 @@ +inherited: true +owners: + - sterni diff --git a/users/sterni/nint/README.md b/nix/nint/README.md index ddd8045f7378..ddd8045f7378 100644 --- a/users/sterni/nint/README.md +++ b/nix/nint/README.md diff --git a/users/sterni/nint/default.nix b/nix/nint/default.nix index 5cf83d15d6f3..5cf83d15d6f3 100644 --- a/users/sterni/nint/default.nix +++ b/nix/nint/default.nix diff --git a/users/sterni/nint/nint.rs b/nix/nint/nint.rs index 3d430612851a..3d430612851a 100644 --- a/users/sterni/nint/nint.rs +++ b/nix/nint/nint.rs diff --git a/web/bubblegum/README.md b/web/bubblegum/README.md index 0e09c1c65ed6..48c2ba6e0328 100644 --- a/web/bubblegum/README.md +++ b/web/bubblegum/README.md @@ -2,7 +2,7 @@ `bubblegum` is a CGI programming library for the Nix expression language. It provides a few helpers to make writing CGI scripts which are executable -using [//users/sterni/nint](../../users/sterni/nint/README.md) convenient. +using [//nix/nint](../../nix/nint/README.md) convenient. An example nix.cgi script looks like this (don't worry about the shebang too much, you can use `web.bubblegum.writeCGI` to set this up without diff --git a/web/bubblegum/default.nix b/web/bubblegum/default.nix index 0ad541390bb7..2db6f042044b 100644 --- a/web/bubblegum/default.nix +++ b/web/bubblegum/default.nix @@ -7,6 +7,7 @@ let getBins utils sparseTree + nint ; minimalDepot = sparseTree depot.path [ @@ -186,7 +187,7 @@ let else "${scriptName}/${path}"; bins = getBins pkgs.coreutils [ "env" "tee" "cat" "printf" "chmod" ] - // getBins depot.users.sterni.nint [ "nint" ]; + // getBins nint [ "nint" ]; /* Type: args -> either path derivation string -> derivation */ |