chore(nint): move from //users/sterni to //nix
Since //web/bubblegum depends on nint, we need to move it to a non user directory to conform with the policy established via cl/3434. Note that this likely doesn't mean greater stability (which isn't really implied in depot anyways), since I still would like to use a more elaborate calling convention to allow for additional useful features. Change-Id: I616f905d8df13e3363674aab69a797b0d39fdd79 Reviewed-on: https://cl.tvl.fyi/c/depot/+/3506 Tested-by: BuildkiteCI Reviewed-by: tazjin <mail@tazj.in>
This commit is contained in:
parent
5d5fb4e6a1
commit
318d10e608
8 changed files with 7 additions and 8 deletions
|
@ -58,6 +58,7 @@ configuration is tracked in `//ops/{modules,machines}`.
|
||||||
software. Currently only SBCL is supported. Lisp programs in this repository
|
software. Currently only SBCL is supported. Lisp programs in this repository
|
||||||
are built using this library.
|
are built using this library.
|
||||||
* `//web/bubblegum` contains a CGI-based web framework written in Nix.
|
* `//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.
|
* `//tvix` contains initial work towards a modular architecture for Nix.
|
||||||
* `//third_party/nix` contains [our fork][tvix] of the Nix package manager.
|
* `//third_party/nix` contains [our fork][tvix] of the Nix package manager.
|
||||||
|
|
||||||
|
@ -88,7 +89,6 @@ Some examples:
|
||||||
[tazj.in](https://tazj.in)
|
[tazj.in](https://tazj.in)
|
||||||
* `//users/grfn/xanthous`: A (WIP) TUI RPG, written in Haskell.
|
* `//users/grfn/xanthous`: A (WIP) TUI RPG, written in Haskell.
|
||||||
* `//users/tazjin/emacs`: tazjin's Emacs & EXWM configuration
|
* `//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.
|
* `//users/tazjin/finito`: A persistent finite-state machine library for Rust.
|
||||||
|
|
||||||
# Licensing
|
# Licensing
|
||||||
|
|
|
@ -34,11 +34,6 @@ let
|
||||||
# TODO(tazjin): Can this one be removed somehow?
|
# TODO(tazjin): Can this one be removed somehow?
|
||||||
[ "ops" "nixos" ]
|
[ "ops" "nixos" ]
|
||||||
[ "ops" "machines" "all-systems" ]
|
[ "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
|
then args
|
||||||
else args // {
|
else args // {
|
||||||
|
|
3
nix/nint/OWNERS
Normal file
3
nix/nint/OWNERS
Normal file
|
@ -0,0 +1,3 @@
|
||||||
|
inherited: true
|
||||||
|
owners:
|
||||||
|
- sterni
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
`bubblegum` is a CGI programming library for the Nix expression language.
|
`bubblegum` is a CGI programming library for the Nix expression language.
|
||||||
It provides a few helpers to make writing CGI scripts which are executable
|
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
|
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
|
too much, you can use `web.bubblegum.writeCGI` to set this up without
|
||||||
|
|
|
@ -7,6 +7,7 @@ let
|
||||||
getBins
|
getBins
|
||||||
utils
|
utils
|
||||||
sparseTree
|
sparseTree
|
||||||
|
nint
|
||||||
;
|
;
|
||||||
|
|
||||||
minimalDepot = sparseTree depot.path [
|
minimalDepot = sparseTree depot.path [
|
||||||
|
@ -186,7 +187,7 @@ let
|
||||||
else "${scriptName}/${path}";
|
else "${scriptName}/${path}";
|
||||||
|
|
||||||
bins = getBins pkgs.coreutils [ "env" "tee" "cat" "printf" "chmod" ]
|
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
|
/* Type: args -> either path derivation string -> derivation
|
||||||
*/
|
*/
|
||||||
|
|
Loading…
Reference in a new issue