Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -106,15 +106,12 @@ let
in
with-inputs outputs
```
Consumer projects that use `with-inputs` will automatically inject their own `inputs` as `inputsOverrides`.

[^output-trick]: To use the experimental `nix` cli commands, create a `flake.nix` containing only
```nix
{ outputs = _: import ./.; }
```
[^output-trick-2]: To additionally allow inputs overrides (eg, by a `with-inputs`-based consummer project):
```nix
{ outputs = inputsOverrides: import ./. { inherit inputsOverrides; }
```

### Flake backed by non-flake pins
When `with-inputs` detect a flake dependency which does not declare any inputs, that flake `output` function is still called with the all available inputs, so they could be used as overrides.
Expand Down
1 change: 0 additions & 1 deletion fixtures/with-inputs-flake/flake.nix

This file was deleted.

7 changes: 2 additions & 5 deletions templates/flake/default.nix
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
{
with-inputs ? import ./with-inputs.nix,
follows ? ./follows.nix,
outputs ? ./outputs.nix,
...
inputsOverrides ? { },
}:
with-inputs follows outputs
import ./with-inputs.nix [ ./follows.nix inputsOverrides ] ./outputs.nix
32 changes: 16 additions & 16 deletions templates/flake/flake.lock

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

7 changes: 2 additions & 5 deletions templates/lon/default.nix
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
{
with-inputs ? import ./with-inputs.nix,
follows ? ./follows.nix,
outputs ? ./outputs.nix,
...
inputsOverrides ? { },
}:
with-inputs follows outputs
import ./with-inputs.nix [ ./follows.nix inputsOverrides ] ./outputs.nix
24 changes: 12 additions & 12 deletions templates/lon/lon.lock
Original file line number Diff line number Diff line change
Expand Up @@ -7,39 +7,39 @@
"owner": "denful",
"repo": "den",
"branch": "main",
"revision": "4f15fb43dd17a5ace3680cde297e31bc7e017c91",
"url": "https://github.com/denful/den/archive/4f15fb43dd17a5ace3680cde297e31bc7e017c91.tar.gz",
"hash": "sha256-zWghnHLAo5rrOxZZXA2E5rY+aEKx/MwVQzL5eCbexJc="
"revision": "36c8ba5c07e2aa7d4816c6314ff2b6656293dee4",
"url": "https://github.com/denful/den/archive/36c8ba5c07e2aa7d4816c6314ff2b6656293dee4.tar.gz",
"hash": "sha256-2NVetxl+ycFWX4NZTCRqEnx4F37QajVpJe/b+n1Xw9I="
},
"home-manager": {
"type": "GitHub",
"fetchType": "tarball",
"owner": "nix-community",
"repo": "home-manager",
"branch": "master",
"revision": "1dc2d1f720ab17fc7981e087346bf54b26d284b1",
"url": "https://github.com/nix-community/home-manager/archive/1dc2d1f720ab17fc7981e087346bf54b26d284b1.tar.gz",
"hash": "sha256-G0F2rFORVcFkEvVdE/qWQTnYekIc77YP5/vRF9nZlxU="
"revision": "693e8ce0fb240a73c116a03cfd7b19269c87af88",
"url": "https://github.com/nix-community/home-manager/archive/693e8ce0fb240a73c116a03cfd7b19269c87af88.tar.gz",
"hash": "sha256-Ro/e1N4ZR8/XaFF+sF9SgfPK79HM5YNEppzFj8p+0Ak="
},
"nixpkgs": {
"type": "GitHub",
"fetchType": "tarball",
"owner": "nixos",
"repo": "nixpkgs",
"branch": "master",
"revision": "35adf7a938f3189febd497330e2f1fe09b632a69",
"url": "https://github.com/nixos/nixpkgs/archive/35adf7a938f3189febd497330e2f1fe09b632a69.tar.gz",
"hash": "sha256-cZPb6rWoDLkSFBFVXT9iznDfWQwSRdP+YYukEVGPPFY="
"revision": "217ee364d167bf7ff819c7e2d1a1b8140f4afc0d",
"url": "https://github.com/nixos/nixpkgs/archive/217ee364d167bf7ff819c7e2d1a1b8140f4afc0d.tar.gz",
"hash": "sha256-5jcl+RckGopvvB0Zz1ORU2AKT39r2ncchMuXAntAxAw="
},
"with-inputs": {
"type": "GitHub",
"fetchType": "tarball",
"owner": "denful",
"repo": "with-inputs",
"branch": "main",
"revision": "dae6b8126fe613bfe12185d94d593db426a34daa",
"url": "https://github.com/denful/with-inputs/archive/dae6b8126fe613bfe12185d94d593db426a34daa.tar.gz",
"hash": "sha256-ZPGmgcJX+xBAbA0edQC59ewoH56LhAqkH1Y/5KjV9J0="
"revision": "f0a6bc2464d744e6e3089f89ea6efeb9427c4acd",
"url": "https://github.com/denful/with-inputs/archive/f0a6bc2464d744e6e3089f89ea6efeb9427c4acd.tar.gz",
"hash": "sha256-yFXytpx2/EzFCji5gbn819t9AcIOe5LnlFTnrIkoZ/Q="
}
}
}
7 changes: 2 additions & 5 deletions templates/niv/default.nix
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
{
with-inputs ? import ./with-inputs.nix,
follows ? ./follows.nix,
outputs ? ./outputs.nix,
...
inputsOverrides ? { },
}:
with-inputs follows outputs
import ./with-inputs.nix [ ./follows.nix inputsOverrides ] ./outputs.nix
24 changes: 12 additions & 12 deletions templates/niv/nix/sources.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
"homepage": "https://den.oeiuwq.com/",
"owner": "denful",
"repo": "den",
"rev": "0af82e24be89b9fd400bd0b58b0fed5ea0f269ad",
"sha256": "0insm3sqyjwdpnrlnx05n61547ifgkwx86bkfx5hzpw4glhrg1db",
"rev": "36c8ba5c07e2aa7d4816c6314ff2b6656293dee4",
"sha256": "1ln3axyzmnzg4mlkasnhgqbphz0jd8j4qnc3bxbc3jby36vmxmfq",
"type": "tarball",
"url": "https://github.com/denful/den/archive/0af82e24be89b9fd400bd0b58b0fed5ea0f269ad.tar.gz",
"url": "https://github.com/denful/den/archive/36c8ba5c07e2aa7d4816c6314ff2b6656293dee4.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"home-manager": {
Expand All @@ -17,10 +17,10 @@
"homepage": "https://nix-community.github.io/home-manager/",
"owner": "nix-community",
"repo": "home-manager",
"rev": "5c1b74905c7261e8280dcda3623dbe677a1bc158",
"sha256": "1cnmhdlf462nmp0rz56fvghkdr4hpj7dla0c9nqdpg2lszdzc7bb",
"rev": "693e8ce0fb240a73c116a03cfd7b19269c87af88",
"sha256": "02fhgv58zicwlr287rfcs7pwmww1a9gv0zjid3bwyiqrvvadx3s6",
"type": "tarball",
"url": "https://github.com/nix-community/home-manager/archive/5c1b74905c7261e8280dcda3623dbe677a1bc158.tar.gz",
"url": "https://github.com/nix-community/home-manager/archive/693e8ce0fb240a73c116a03cfd7b19269c87af88.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"nixpkgs": {
Expand All @@ -29,10 +29,10 @@
"homepage": "",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "7aaa00e7cc9be6c316cb5f6617bd740dd435c59d",
"sha256": "00im6i10slkya33vmmb1lhzmnlqcnppp5z7s580kn78vf7dh99sr",
"rev": "9387b3fcc0c23c86661636da63faabad4235a0a6",
"sha256": "0364mbq5s3yjj1bq5qhwwsllxmgsrjfydh6377wky4y0zap89apd",
"type": "tarball",
"url": "https://github.com/nixos/nixpkgs/archive/7aaa00e7cc9be6c316cb5f6617bd740dd435c59d.tar.gz",
"url": "https://github.com/nixos/nixpkgs/archive/9387b3fcc0c23c86661636da63faabad4235a0a6.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"with-inputs": {
Expand All @@ -41,10 +41,10 @@
"homepage": "https://dendritic.oeiuwq.com/ecosystem/with-inputs/",
"owner": "denful",
"repo": "with-inputs",
"rev": "b4cbe858b381c0ee0fe617498549f0562090ad04",
"sha256": "1p58zdbprnx74vwd2bdp1qmq32l55gh52fnyfxpjy3capkh9j0hs",
"rev": "f0a6bc2464d744e6e3089f89ea6efeb9427c4acd",
"sha256": "1x37524srrsljkkr4yqfq80pvnypzjwq3f9q1b2lrz3nkjvg4mf8",
"type": "tarball",
"url": "https://github.com/denful/with-inputs/archive/b4cbe858b381c0ee0fe617498549f0562090ad04.tar.gz",
"url": "https://github.com/denful/with-inputs/archive/f0a6bc2464d744e6e3089f89ea6efeb9427c4acd.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
}
}
2 changes: 1 addition & 1 deletion templates/niv/with-inputs.nix
Original file line number Diff line number Diff line change
@@ -1 +1 @@
(import (import ./nix/sources.nix).with-inputs).from.npins ./.
(import (import ./nix/sources.nix).with-inputs).from.niv ./.
7 changes: 2 additions & 5 deletions templates/nixtamal/default.nix
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
{
with-inputs ? import ./with-inputs.nix,
follows ? ./follows.nix,
outputs ? ./outputs.nix,
...
inputsOverrides ? { },
}:
with-inputs follows outputs
import ./with-inputs.nix [ ./follows.nix inputsOverrides ] ./outputs.nix
Loading
Loading