Commit Graph

308 Commits

Author SHA1 Message Date
Gytis Ivaskevicius
12917cba31 #63: Replace saneFlakeDefaults with nix.generateRegistryFromInputs option 2021-05-23 18:25:52 +03:00
Gytis Ivaskevicius
eb85b667f5 #60: nixUnstable -> nixFlakes 2021-05-23 14:29:30 +03:00
Gytis Ivaskevicius
19dc794280 Rename lib to src 2021-05-23 14:27:33 +03:00
Gytis Ivaskevicius
3929c2b70c
Merge pull request #65 from Pacman99/modulesFromList-improvements
modulesFromList: allow for import customization
2021-05-21 17:56:08 +03:00
Pacman99
8d8f9d734d modulesFromList: allow for import customization
and allow .toml files
2021-05-20 23:47:32 -07:00
Gytis Ivaskevicius
c7ba2eb392
Merge pull request #59 from gytis-ivaskevicius/add-outputs-builder
Add replace xyzBuilder with unified 'outputsBuilder'
2021-05-20 00:05:45 +03:00
Gytis Ivaskevicius
1efba19f46 Add build-all and check-all commands 2021-05-19 12:15:21 +03:00
Gytis Ivaskevicius
78f7c9bb29 Tests cleanup 2021-05-19 12:08:44 +03:00
Gytis Ivaskevicius
6bdff31991 Add derivation tests 2021-05-17 23:24:27 +03:00
Gytis Ivaskevicius
3c6efcb00e Add replace xyzBuilder with unified 'outputsBuilder' 2021-05-17 23:16:47 +03:00
Pacman99
e0278428df fromOverlays: opt-in for exporting sub-systems
sub-systems are not great for flakes ecosystems and this prevents
exporting overriden sub-systems from nixpkgs
2021-05-17 14:39:37 -04:00
Gytis Ivaskevicius
f4d05364b8
Work on tests and restructoring (#54)
* Add tests/derivation-outputs

* Remove cases covered by tests

* Add channel patching test cases

* Remove patching code leftovers as part of the example

* Remove Summer CI

* Add tests/overlays-flow

* Fix devshell root path

* Fix overlays tests

* Cleanup tests

* Work on hosts config test

* Add rm-locks command

* Add validation for host options inheritance

* Evaluate builder

* Add examples/minimal-multichannel

* Add examples/home-manager+nur+neovim

* Add examples/exporters

* Remove examples/fully-featured

* Remove devshell.toml

* Moving files around

* Fix rm-locks command and add exporters build

* Improve devshell
2021-05-15 16:47:15 +03:00
Pacman99
1a742047f3 flake: update flake-utils input
includes filterPackages improvements
2021-05-11 23:32:21 -07:00
Pacman99
c7eb6892a0
Merge pull request #53 from Pacman99/dontexport-srcs
set __dontExport to srcs overlay
2021-05-03 08:11:02 -07:00
Pacman99
3c4ea74510
Merge pull request #52 from Pacman99/prefer-self-pkgs
always use self.pkgs instead of channels
2021-05-03 08:10:38 -07:00
Pacman99
f325752250 set __dontExport to srcs overlay
This doesn't hurt in any way, but prevents export for those who use
overlaysFromChannelsExporter
2021-05-02 08:51:35 -07:00
Pacman99
1630b591a1 always use self.pkgs instead of channels
this allows systemFlake to be called multiple times without having to
pass `channels` each time. As long as it just uses self.pkgs, nixpkgs
will only get evaluated once and all systemFlake calls use the same
channels set
2021-05-02 08:44:50 -07:00
Pacman99
0642ac572a
Merge pull request #50 from Pacman99/dontexport-overlay
Option to not export overlay
2021-04-29 09:33:24 -07:00
Pacman99
1d2be7304d Add ability to create non-exported overlays
with the __dontExport property
2021-04-28 10:11:50 -07:00
Gytis Ivaskevicius
7c085ed23f Add 'srcs' to overlays 2021-04-27 14:31:19 -05:00
Pacman99
8eb7f92067 export mergeAny in public lib 2021-04-27 09:08:40 -05:00
Pacman99
be032a4396 prevent infinite recursion in overlays exporter
sometimes the inputs argument might contain "self", so drop that if it
does. This is just for safety, it usually won't contain self
2021-04-26 16:44:27 -07:00
David Arnold
80b53eeda3 fixups / cleanups devshell 2021-04-26 07:08:55 -05:00
David Arnold
b608376888 add simple devshell & align dev and ci environment 2021-04-26 07:08:55 -05:00
Pacman99
0f0c1487ef
Merge pull request #44 from Pacman99/channel-specialArg
pass channel info to hosts as channel specialArg
2021-04-25 23:13:58 -07:00
Pacman99
1245b7ecb1 fix Rick host build by making it separate 2021-04-25 23:09:30 -07:00
Pacman99
4439748db4 pass channel to hosts as channel specialArg
add name and input to each channel
2021-04-25 23:09:30 -07:00
Pacman99
addbb12d16
Merge pull request #43 from Pacman99/cleanup-exporters
General exporter and builderConstructor improvements
2021-04-25 13:13:34 -07:00
Pacman99
e3ba66785f examples: demonstrate updated exporters/builders
specifically packagesFromOverlaysBuilderConstructor and
overlaysFromChannelsExporter
2021-04-25 13:07:12 -07:00
Pacman99
052909fa78 packagesBuilder constructor: take set of overlays
This is intended to be self.overlays which allows a cleaner api to pass
what overlays should be collected and used to create packages export
2021-04-25 13:07:12 -07:00
Pacman99
f6c13a7f92 overlays exporter: use pkgs and inputs
use pkgs to collect overlays from each channel, since user only passes
overlaysBuilder for each channel. Also filter out any overlays defined
in inputs
2021-04-25 13:04:02 -07:00
David Arnold
4eb7af83fb fix test 2021-04-25 15:00:03 -05:00
David Arnold
7418d2ca5a imp: provide per channel modules paths to make it easy to "backport"
a module. imports = [ ${myChannelModulesPathk}/installer/...

Signed-off-by: David Arnold <dar@xoe.solutions>
2021-04-25 15:00:03 -05:00
Pacman99
9b9145e52f update flake-utils for filterPackages fixups 2021-04-25 07:52:44 -07:00
Gytis Ivaskevicius
e7ae270a23
Merge pull request #6 from gytis-ivaskevicius/staging
Release 1.1.0
2021-04-25 16:51:57 +03:00
Gytis Ivaskevicius
d37a46ef20 Improve documentation 2021-04-25 16:30:35 +03:00
Gytis Ivaskevicius
323b5581bb Update README.md 2021-04-24 23:58:47 +03:00
Gytis Ivaskevicius
54fad31afe Fix nixpkgs options populating 2021-04-24 23:53:35 +03:00
Gytis Ivaskevicius
7e588e85da Fix repl config option 2021-04-24 23:38:08 +03:00
Gytis Ivaskevicius
072c13ce13
Merge pull request #36 from chvp/staging
Use nixos modules and lib from patched nixpkgs and allow setting nixpkgs.config values in host modules
2021-04-19 18:44:01 +03:00
Charlotte Van Petegem
670a7b7735
Fix nix-darwin evaluation 2021-04-19 15:53:00 +02:00
Charlotte Van Petegem
9c950cdf2e
Add comments explaining new checks 2021-04-19 15:30:35 +02:00
Charlotte Van Petegem
22844065c7
Add tests to fully featured that check whether patched nixpkgs and host config are used 2021-04-19 15:30:35 +02:00
Charlotte Van Petegem
5ceb833add
Resolve minor comments 2021-04-19 15:30:35 +02:00
Charlotte Van Petegem
0065233cac
Only import nixpkgs again if the host set something in nixpkgs.config 2021-04-19 15:30:35 +02:00
Charlotte Van Petegem
d53cacaeb8
Make sure nix-darwin hosts can still evaluate (I think?) 2021-04-19 15:30:35 +02:00
Charlotte Van Petegem
fbd15f15b6
Use modules and lib from patched nixpkgs 2021-04-19 15:30:35 +02:00
Charlotte Van Petegem
cd934d0e93
Bring back _module.args.pkgs fallback
Presumably for `nix-darwin`?
2021-04-19 15:30:35 +02:00
Charlotte Van Petegem
28a469ec79
Allow both patched nixos and nixpkgs.config values in host modules 2021-04-19 15:30:34 +02:00
Gytis Ivaskevicius
0ad6b69381 Add darwin tmp fix 2021-04-19 10:16:25 +03:00