mkDevos and evalDevosArgs: Move flake implementation logic into lib #206

Pacman99 · 2021-03-20T17:02:13Z

Moving all logic to lib makes things easier to change and understand, since whenever you add a feature, you only have to edit relevant functions in lib. And for a user, they don't have to understand whats happening behind the scenes. But if they want to I think reading functions in lib is simpler than reading implementation logic thats in different places around the directory.

But most importantly this allows for a lib function called mkDevos which is a potential solution to #91. The mkDevos function can take other an input of other flakes and build a devos flake just like this repo does. So this creates an alternate method of using devos, where you just add devos as an input then do

devos.lib.mkDevos { inherit self; }

And then you can just create the relevant directories(this could be shipped as its own template) and those directories will be imported. This change is also backwards compatible as demonstrated in the updated flake.nix where the current devos just calls mkDevos with itself. So a user can either just clone this repo and use it like its currently being used, or they can use the lib function.. The advantage of just using the lib function is you no longer have to worry about merging upstream and conflicts that arise, you can just update your devos input, so nix flake takes care of syncing with the mothership for you.

Keep in mind you have to add all inputs devos depends on along with devos for the new method to work because of an issue with the way follows works in flakes. This should be fixed by NixOS/nix#4641 which would allow you to write a devos flake.nix in under 10 lines.

lib/devos/mkDevos.nix

lib/devos/mkSuites.nix

nrdxp · 2021-03-21T03:02:48Z

Very interesting. I had another exhausting day, so I won't even try to review this right now. But I'll definitely have a good look at this soon.

blaggacao

This totally satisfies my desire for clear interfaces.

I've taken a first read and I find it really easy to reason about it.

It is really comfortable and totally magic-less to have mkDevos.nix give an overview of the default file system layout in only aboy 10 lines from the function arguments.

I have a few associations, but I'll keep them for opening new issues and discuss them individially / incrementally once this general direction is merged.

gytis-ivaskevicius · 2021-03-21T18:09:11Z

Hey, I am the guy from Reddit - I have to say, this really does look like my project :D Good stuff tho, hopefully, this will get merged! :)

blaggacao · 2021-03-22T03:08:59Z

@Pacman99 totally open ended question: what benefits and drawbacks would you see in making this a flake-utils-plus-plus repo within divnix orga?
Then we can — for the fun and crosspolination — try to rebase on flake-utils-plus.

Pacman99 · 2021-03-22T03:30:10Z

@Pacman99 totally open ended question: what benefits and drawbacks would you see in making this a flake-utils-plus-plus repo within divnix orga?

Actually now that you mention that, I was actually considering setting up a fork of devos that exported all its features as a lib function. I would really like to not do that, but if I did I would keep it as close to devos as possible and just add a lib function layer. But it would be much better if it was in devos instead. I mainly wasn't sure if you all wanted devos to go in this direction of being a lib function rather than a template. This PR attempts to make a compromise by doing both. Move everything to lib but maintain folder structure/template.
If this PR was done as a fork, it would be really hard to maintain. And I think moving the logic to lib is a change that would really improve devos, even if we decide not to include the mkDevos part.

Also there is one feature I like from flake-utils-plus is you can pass builders and change how things are exported. It would be cool if you can pass some sort of overlay to mkDevos. Perhaps you could override lib functions and change how things are implemented.

blaggacao · 2021-03-22T03:53:42Z

I mainly wasn't sure if you all wanted devos to go in this direction of being a lib function rather than a template. This PR attempts to make a compromise by doing both.

Very wise choice. I agree, before v1.0, or even beyond that point, it is a feature to be able to hack one's own mkNetBoot = netbootConfigurationBuilder by means of commit trees rather than nix overlays (upstream PR is litterally just one click away).

nrdxp · 2021-03-23T02:19:06Z

it's all you @Pacman99
delegate+

lib/devos/mkDevos.nix

Pacman99 · 2021-03-23T19:15:02Z

lib/devos/mkProfileAttrs.nix

@@ -27,7 +27,7 @@ let mkProfileAttrs =
    f = n: _:
      lib.optionalAttrs
        (lib.pathExists "${dir}/${n}/default.nix")
-        { default = /. + "${dir}/${n}"; }
+        { default = builtins.toPath "${dir}/${n}"; }


This is a deprecated function, but without this I get an error that store paths in strings can't be appended to paths.
I tried builtins.path too and that didn't work. I think this could be reported upstream, I'm just not sure what to report.

does toString work?

Not sure what you mean. It is already a string. But I did try toString /. + .... That didn't work, but it is redundant since it defeats the point of the original change.

lib/devos/mkDevos.nix

Pacman99 · 2021-03-23T19:18:40Z

bors try

bors · 2021-03-23T19:18:51Z

try

Build failed:

ci/hercules/evaluation

Pacman99 · 2021-03-23T19:21:03Z

bors try

bors · 2021-03-23T19:23:14Z

try

Build succeeded:

Pacman99 · 2021-03-24T22:54:57Z

Update: I added a genDoc function to evalDevosArgs that creates markdown documentation. The markdown rendering is custom made, so the formatting could use some review. You can now build option documentation with
nix build .#devosOptionsDoc. I'm not sure where to put it in tree, I'm thinking of putting it in lib.
Rendered doc

…or typed options

Pacman99 · 2021-03-25T18:19:06Z

Dropped the pathOr type so all options are explicitly type checked. And instead the importing of paths is done as part of the default with the new importIf function, which allows for fallbacks. This has the added benefit of many options not being required, for example, users can safely delete the modules folder and due to the fallback in importIf no error will be triggered.
I also moved more of the implementation logic for each option to their relevant apply keys: profiles, users, and userProfiles get directly evaluated through the apply key. So mkSuites does less work.

Pacman99 · 2021-03-25T23:06:50Z

Update: created a mkdevos template with a list of excluded folders that aren't needed when using mkdevos. And some general doc cleanups.

Pacman99 · 2021-03-26T01:38:52Z

~~The only thing that I have left for this PR is to fix overlays, so it doesn't break community.~~ fixed this by discarding string context, apparently flake output attributes can't have any references to store paths.
I think this is fully for ready for review - I don't plan on changing anything else. @gytis-ivaskevicius If you could take a look too that would be great - I can't request your review on github ui.
Also the function might be renamed to mkDevosFlake(@blaggacao idea), but I'm not yet sure about that. And possibly a test might be added for mkDevos.

…ent flake check error

blaggacao · 2021-03-26T10:42:55Z

Also the function might be renamed to mkDevosFlake(@blaggacao idea), but I'm not yet sure about that.

numtide/devshell went from devshell.mkDevshell: "devshell, make a devshell" to devshell.mkShell: "devshell, make a shell of yours".

Reason: the authors probably believed, as I do, that there are people who notice the fine matices of overzealous "branding" and percieve it as obnauxious.

Code becomes more concise, if one is able to read it out in plain english, hence:

devos.mkDevos: "devos, make a dev OS", in addition to potential overzealous beanding due to repetition, is semantically not correct. This function does not make a single operating system of type "dev". Correct is: "devos, make an environment of yours" or a more scoped "devos, make a flake of yours", but if we want to impose ourselves a little more "devos, make a Devos environment" or "devos, make a Devos flake".

I'd vote for "devos, make a flake if yours" which has most informational value per char and is in line with stances of numtide/devshell & flake-utils-plus.

Note that, with flakes as opposed to traditional global pkgs namespace, the caller will most likely have the devos namespace in scope, hence duplicating the repo brand is a statement, we might not actually want to make.

blaggacao

Ha, my parts of my review from two days ago survied battery die-out in the cache...

I'll request some changes in naming and docs to polish this off.

The docs might need a few iterations, still. I'm concerned with just throwing "random" options without super clear use cases or context at users in plain nix-ecosystem-style. To reach our goals, this is one of the in my opinion bad practices in the nix ecosystem, I don't think we should inherit.

The docs should answer more questions, than they generate. Here, I'm especially concerned to have a cryptic "Use mkDevos" in the index in absence of a clear self-identifying use-case in the title, like "How to get started" or "Use devos as a library!" — with exclamation mark it is a recommendation (with impetus) and I think in line what we actually want to recommend (with impetus) in the future.

Then we could elaborate around that central theme "use it as a library" as a three paragrapher with a structure around the lines of either of e.g.

problem — solution — benefit
what? — now what? — so what?
benefit — solution — example

I could offer to have a take on the docs, if you want, but it would be some days into the future still, until I have again full dominion over my working workstation. Let me know.

blaggacao · 2021-03-24T06:18:41Z

lib/devos/default.nix

@@ -7,10 +7,21 @@
      config = { allowUnfree = true; };
    };

+  importIf = path: if builtins.isPath path || builtins.isString path


flake-utils/simple flake calls this maybeImport. Since the condition is implicit we neither know nor care at the calling site, so we might copy that naming.

Just realized, its different here. But as elaborated in conjunction with my other comments, it probably should not be.

Coming from that tacit stance which slowly unrevealed itself to me in proper shape, is probably why I got confused in the first place.

blaggacao · 2021-03-24T06:58:03Z

doc/start/use-mkdevos.md

+```
+then replace the outputs section with this:
+```nix
+outputs = { self, devos, ... }: devos.lib.mkDevos { inherit self; };


From a clean naming point of view this should be devos.lib.mkFlake.

"Make a flake with devos". Else we immediatly have a reasoning issue:

What is this Devos, that you can make with devos?!?

devos.mkFlake for external devos-as-a-library users.

blaggacao · 2021-03-24T07:08:31Z

doc/start/use-mkdevos.md

@@ -0,0 +1,36 @@
+# Use mkDevos
+You can also use devos as a flake input and get the advantage of using


I'm not a big fan of just throwing options at the user. It increases complexity and defeats the purpose of being easy-onboarding.

We should clearly blueprint the use case in simple english so that users can identify themselves as "yes that's me, I'll do it this way".

devos.lib

If you think devos template is tpp complicated ...

Once we are 1.0, don't fork this (!), use it as a lib instead...

...

I think for now it should be documented as a 'next step' and another option. My reasoning is that there is some work to switch to the mkDevos method, and it's not an easy change.

blaggacao · 2021-03-24T07:12:47Z

doc/start/use-mkdevos.md

+nix flake update --update-input devos
+```
+
+If you would like to change your directory's structure, you can pass


I'm not a big fan of nobleing this into the docs as a stand-alone use case: I'm not sure if preference is a use case motivated all by itself.

Also we should not throw options at users without clear guidance in what situations they have to use which option.

blaggacao · 2021-03-24T07:18:21Z

doc/start/use-mkdevos.md

+look at [evalDevosArgs](../../lib/devos/evalDevosArgs.nix) to learn about
+the arguments that it can take.
+
+> ##### Notes:


A few too many notes, I guess. If it merits exhibition, then it probably also deserves more than a note.

We should find other means for them.

My thoughts too, the docs need some work

blaggacao · 2021-03-24T07:21:08Z

doc/start/use-mkdevos.md

+>   the [core profile](../../profiles/core)
+> - You can append `/community` to the `devos.url` to get access to community modules
+>   which can be added in [extern](../../extern).
+> - To use community profiles, you will have to copy them to your tree


Why? — asks the reader (not me).

Is it relevant (enough) to mention? Can't it be solved with better UX?

Well its because profiles are not exported anywhere in the flake. I don't see the point in adding the why to docs. And also at some point we could try to export profiles under nixosModules to fix this.

blaggacao · 2021-03-24T07:26:15Z

doc/start/use-mkdevos.md

+> - You can append `/community` to the `devos.url` to get access to community modules
+>   which can be added in [extern](../../extern).
+> - To use community profiles, you will have to copy them to your tree
+> - If you use this method, you will no longer be able to edit devos internals.


I think this can be dropped. Rather we need to define clear guidance when users are expected to use which method:

library

template

fork

I think maybe we should avoid (end user) documenting this PR alltogether at this moment and rather have a discussion about what usage modes we recommend for which situation.

I would appreciate being told this, just to make it clear the cons of using mkDevos.

blaggacao · 2021-03-24T07:31:43Z

lib/devos/evalDevosArgs.nix

@@ -0,0 +1,103 @@
+{ self, dev, nixos, inputs, ... }:


dev. This PR is totally the wrong place to complain, but every time I read it, I have to go through an uncounted number of mental hops to figure out what it means. 😕

What is it? (Can we make that evident from its name?)

I don't like dev either, it is kind of confusing. I'm not sure how to fix it though outside of better documentation. Its just a side effect of needing to export lib as lib in the flake, but also requiring a way to access devos lib within other devos lib functions.

perhaps simply renaming to osLib or devLib. I really just went with dev to keep it as convenient as lib, i.e. three chars.

I personally think dev is ok, my main issue is the fact that lib in some places refers to devos lib and in other places refers to nixos lib. perhaps we can just standardize dev and use it everywhere even in flake.nix. So dev always refers to devos lib and lib always refers to nixos lib. I'm confusing myself nevermind. We should definitely export the devos lib as lib in flake.nix.

blaggacao · 2021-03-24T07:36:50Z

lib/devos/evalDevosArgs.nix

+  argOpts = with nixos.lib; { config, ... }:
+    let
+      inherit (dev) os;
+      inherit (os) importIf;


Could that be devos.lib.maybeImport just as if any external lib consumer would imvoke it at the calling site? The os token is similarily unfortunate as is dev in my opinion.

Or to align with how we import:

import (devos.lib) maybeImport

Looka like it would be maybeImportElse, now.

I'm also not sold on not declaring it locally as long as it is not of actual use in another place.

I could just declare it in evalDevosArgs, its really only useful there.
Still thinking of names, importWithFallback is along the lines of what I'll probably go with.

Should not be necessary with mkFlake

blaggacao · 2021-03-24T07:42:33Z

lib/devos/evalDevosArgs.nix

+          default = "${self}/users";
+          description = "path to folder containing user profiles";
+        };
+        extern = mkOption {


Instead kf encapsulating this within extern, I would prefer those things to be declared at the top level flake.nix.

Those are even higher level than suites.nix, which I'm going to propose below.

We should just make them direct attributes of mkDevos / mkFlake, that is top level options in here.

Yeah, this is part of the prime devos api, we should refrain from putting it into a badly named extern config object.
Why 2 levels of api?!?

I see your point, but I would also prefer to address things like this in a separate discussion/PR. For now I want mkDevos/mkFlake to just be a mirror of the current devos api. So that way we can separate discussion and lib implementation.

blaggacao

Follow up with went was missing above...

blaggacao · 2021-03-26T11:41:48Z

lib/attrs.nix

-      name = lib.removeSuffix ".nix" (baseNameOf path);
+      name = lib.removeSuffix ".nix"
+        # Safe as long this is just used as a name
+        (builtins.unsafeDiscardStringContext (baseNameOf path));


What's motivating this change?

(And typo in the comment)

see pr that changes pathsToImportedAttrs I put reasoning there.

blaggacao · 2021-03-26T11:45:28Z

lib/devos/evalDevosArgs.nix

+  argOpts = with nixos.lib; { config, ... }:
+    let
+      inherit (dev) os;
+      inherit (os) importIf;


Looka like it would be maybeImportElse, now.

blaggacao · 2021-03-26T11:49:21Z

lib/devos/default.nix

@@ -7,10 +7,21 @@
      config = { allowUnfree = true; };
    };

+  importIf = path: fallback:


This does not allow to declare things inline (within the flake). There is no reason to enforce library users to use any sort of file hierarchy.

To reflect that, rather let's use this implementation:

https://github.com/numtide/flake-utils/blob/master/simpleFlake.nix#L31

Big reverbaration step of mine, see other comment about my thought process, here.

Yeah with the planned mkFlake I don't think the 'importIf' function will be necessary. I really only made it to maintain backwards compatibility so mkDevos could be used on devos itself. But I see now why that would be better done outside of lib.

blaggacao · 2021-03-26T11:58:12Z

lib/devos/evalDevosArgs.nix

+          description = "The flake to create the devos outputs for";
+        };
+        hosts = mkOption {
+          type = path;


I'm not convinced of any benefits of encoding any specific file hierarchy into the library's API. The library should require to abstractly fulfill its own requirements and nothing more.

How people organize their files does not matter as long as their contents fulfill the devos requirement.

This stance complements my call for maybeImport: people can also declare functions directly within the top level flake.

Note, that flake.nix will shrink dramatically. Hence the only sane purpose we can give it is "index". We should not hide that away into a library function.

An alternative is to layer another funktion:

devos.mkDevosFlake (to encode file hierarchy) over devos.mkFlake, but we really forego a stripped down flake.nix "index"-service if we don't always specify paths directly within the flake.nix.

So we shoudn't do a mkdDevosFlake / mkDevos at all: the "devos" part in mkDevos would actually become a template. That is much more inclusive of potential future library users.

Will address in planned mkFake PR. So only devos encodes its own filesystem api within its own flake.nix, but its not encoded within lib.

blaggacao · 2021-03-26T12:11:46Z

lib/devos/mkSuites.nix

@@ -0,0 +1,24 @@
+{ lib, dev, ... }:


As promised above, I wanted to suggest to declare suites within flake.nix or at least within top level suites.nix.

Suites are a higher level aggregate of profiles and users, their definition is ultrashort. I don't see a point — by reason of analogy — to burry them in a folder (at the same level as profiles).

Well this function doesn't actually declare suites, it just processes them. suites are still declared in top level and can be declared within the flake. The goal here was to prevent suites from having to do the work of importing profiles and processing them.

blaggacao · 2021-03-26T12:46:31Z

I'm sorry for my convoluted feedback. If it results impossible / inefficient to consume, please split up this PR into its atomic parts, and I'll re-apply a more focused feedback on each increment.

After reverberation in my thoughts, I came to the conclusion, we ought to make any devos library agnostic of any file hierarchy layout. For indexing purpose, file hierachy needs to be declared in (a henceforth stripped down) top level flake.nix

File layout is best encoded as "batteries included but removable" within a template. An abstract devos's library is also attractive to more people (wink at @gytis-ivaskevicius 's impetus) and thereby promotes "consensus".

devos, then, furthermore provides library functions to make it easy to work with our heredary (or similar) file layout.

A rough api design for library users would look like this:

devos.mkFlake
devos.mkHost
...
devos.lib.mkAttributesFromPaths
...

(No point in putting mkFlake under devos.lib since external consumers don't use devos-as-library as anything else than a library.)

We then could reflect that in devos-the-template and adopt it for in-tree devos-the-blueprint (aka core/community): inputs.devos.path = ./lib.

blaggacao · 2021-03-26T13:35:46Z

Note:

With devos-a-library there is still a need for ./lib in the template and general wiring as in "my environment's lib".

This is a proper fix in preparation for #166

gytis-ivaskevicius

Can't wait to see this merged :)

gytis-ivaskevicius · 2021-03-26T16:12:34Z

doc/start/use-mkdevos.md

+inputs = {
+  ...
+  devos.url = "github:divnix/devos";
+};
+```
+then replace the outputs section with this:
+```nix
+outputs = { self, devos, ... }: devos.lib.mkDevos { inherit self; };


Consider instead of specifying individual changes be like "this is how your flake should look like" and users can add extra attributes if necessary

I like that idea. I think docs should be its own PR too, discussion for that can happen on its own.

gytis-ivaskevicius · 2021-03-26T16:14:23Z

flake.nix

-        deploy.nodes = os.mkNodes deploy self.nixosConfigurations;
+    outputs = inputs@{ deploy, nixos, nur, self, utils, ... }:
+      let
+        lib = import ./lib { inherit self nixos inputs; };


Just a little idea for the future - separate the library implementation from this template repository

(probably not relevant as part of this PR)

I think I would be for that. @nrdxp @blaggacao thoughts?

I'm definitely up for it.

Definitly, in the coming days, until 1.0 we might need the benefit of atomic spanning PRs, still, though.

gytis-ivaskevicius · 2021-03-26T16:16:57Z

lib/attrs.nix

@@ -21,7 +21,9 @@ rec {
      paths' = lib.filter (lib.hasSuffix ".nix") paths;
    in
    genAttrs' paths' (path: {


In Nix usually, collection itself (in this case paths') is specified as the last argument. While we are at it - maybe it's time to change it as well?

gytis-ivaskevicius · 2021-03-26T16:23:31Z

lib/devos/evalDevosArgs.nix

+            check = builtins.isFunction;
+            description = "Nixpkgs overlay";
+          };
+          default = importIf "${self}/pkgs" (final: prev: {});


It makes me wonder if users won't get confused at first that something gets picked up by just creating a folder (without manually declaring it)

Good point, I should be able to address this soon when switching to mkFlake which will be more general and then devos will use mkFlake on itself. That way the importIf is not necessary either.. @blaggacao I think this is a good example of the corruption you mentioned.

gytis-ivaskevicius · 2021-03-26T16:24:12Z

lib/devos/default.nix

@@ -7,10 +7,21 @@
      config = { allowUnfree = true; };
    };

+  importIf = path: fallback:
+    if builtins.pathExists path then import path else fallback;


Won't it crash if path does not contain default.nix file?

Yes, but this is supposed to be a thin wrapper around nix's import and that would crash if there is no default.nix.

gytis-ivaskevicius · 2021-03-26T16:27:31Z

lib/devos/mkDevos.nix

+          tests = nixos.lib.optionalAttrs (system == "x86_64-linux")
+            (import "${devos}/tests" { inherit self pkgs; });


other platforms not supported????

Unfortunately not yet, the tests in devos need a bit of reworking for that to happen. But other platforms will be checked using deploy-rs checks, so its not terrible.

gytis-ivaskevicius · 2021-03-26T16:29:21Z

lib/devos/mkHosts.nix

      nix.registry = {
        devos.flake = self;
        nixos.flake = nixos;
-        override.flake = override;
+        override.flake = inputs.override;
      };


Consider something like this https://github.com/gytis-ivaskevicius/flake-utils-plus/blob/staging/modules/saneFlakeDefaults.nix

Yeah I saw that earlier when looking through flake-utils-plus. I've actually had an issue with that though, and I've been meaning to bring it up in devos at some point. When you evaluate your flake after building the registry, the lock file will change to reference paths in your nix store instead of the url's to the inputs. And this sort of reduces reproducability since you can't evaluate your flake on other machines as easily. I ran across this while setting up CI for my server, it kept failing since nix was trying to reference store paths that didn't exist in the CI machine.

gytis-ivaskevicius · 2021-03-26T16:32:38Z

lib/devos/mkHosts.nix

      nix.nixPath = [
        "nixpkgs=${nixos}"
        "nixos-config=${self}/compat/nixos"
-        "home-manager=${home}"
+        "home-manager=${inputs.home}"
      ];


I am getting rid of NIX_PATH in an upcoming release of flake-utils-plus, it does not seem to be particularly relevant in the world of Nix 3.0

Feel free to keep it - tho I'd suggest checking this one out https://discourse.nixos.org/t/i-feel-like-nix-path-creates-more-issues-than-it-fixes/12110/9

I have to agree, NIX_PATH is not the best. I don't know if we will remove this anytime soon though, one of devos goals is to help with the transition to flakes. This part should definitely be removed eventually.

gytis-ivaskevicius · 2021-03-26T16:36:43Z

lib/devos/mkSuites.nix

+  allProfiles =
+    let defaults = lib.collect (x: x ? default) profiles;
+    in map (x: x.default) defaults;
+
+  allUsers =
+    let defaults = lib.collect (x: x ? default) users;
+    in map (x: x.default) defaults;


Consider defining myFunc = it: lib.collect (x: x ? default) it;

Yeah good idea, since I'm already changing the suites implementation logic in #216 I can also address this.

gytis-ivaskevicius · 2021-03-26T16:37:46Z

shell/default.nix

@@ -1,9 +1,8 @@
 { self ? (import ../compat).defaultNix
 , system ? builtins.currentSystem
+, pkgs ? import <nixpkgs> {}


???? is this necessary? nix develop should take care of nixpkgs, not NIX_PATH

Adding the pkgs part is necessary so that the shell implementation doesn't try to create its own instance of pkgs and so it can be called within lib.
The import <nixpkgs> {} part is there because the shell folder is also there for backwards compatibility. So you can still do nix-shell. Without it, nix-shell would error out.

Maybe we can use the back-compat flake (anti corruption layer) which iirc handles also shell back-compat for this class of use cases.

this has been addressed in #217 the solution has some potential for corruption, but only when using old nix-shell, so I don't think its all that bad.

Pacman99 · 2021-03-26T17:09:36Z

Thanks @gytis-ivaskevicius and @blaggacao for all the review! As always the feedback is amazing. Following @blaggacao suggestion, I'm splitting up all these changes into separate PR's, which can each be merged by themselves. So I'll probably end up marking this one as a draft and make a new PR for just the change that involves moving flake logic into lib.
I will still look at all the review here, and try to address it in the other PR's. Also some of @gytis-ivaskevicius's suggestions were more of a critique on parts of devos itself, which is great and definitely something we should address but it will probably be better done in separate PR's. They did make some great points, and we should get around to changing them soon.

Pacman99 · 2021-04-01T20:24:08Z

closing in favor of #218

Pacman99 marked this pull request as draft March 20, 2021 17:02

Pacman99 commented Mar 20, 2021

View reviewed changes

lib/devos/mkDevos.nix Outdated Show resolved Hide resolved

Pacman99 commented Mar 20, 2021

View reviewed changes

lib/devos/mkDevos.nix Show resolved Hide resolved

Pacman99 commented Mar 20, 2021

View reviewed changes

lib/devos/mkSuites.nix Show resolved Hide resolved

blaggacao reviewed Mar 21, 2021

View reviewed changes

Pacman99 force-pushed the mkdevos branch from cc026dd to 2ea44f8 Compare March 22, 2021 02:24

blaggacao mentioned this pull request Mar 22, 2021

Attempt @ 93% for a nixOs FlakeUtils numtide/flake-utils#18

Closed

gytis-ivaskevicius mentioned this pull request Mar 22, 2021

Base for devos gytis-ivaskevicius/flake-utils-plus#2

Closed

Pacman99 marked this pull request as ready for review March 22, 2021 22:04

Pacman99 commented Mar 23, 2021

View reviewed changes

lib/devos/mkDevos.nix Outdated Show resolved Hide resolved

Pacman99 force-pushed the mkdevos branch 3 times, most recently from 5dba721 to 7122fa1 Compare March 23, 2021 19:12

Pacman99 commented Mar 23, 2021

View reviewed changes

Pacman99 force-pushed the mkdevos branch from 7122fa1 to 76bb7df Compare March 23, 2021 19:15

Pacman99 commented Mar 23, 2021

View reviewed changes

lib/devos/mkDevos.nix Outdated Show resolved Hide resolved

bors bot added a commit that referenced this pull request Mar 23, 2021

Try #206:

43e4c58

Pacman99 force-pushed the mkdevos branch from 76bb7df to 03cbecc Compare March 23, 2021 19:20

bors bot added a commit that referenced this pull request Mar 23, 2021

Try #206:

5b211fa

Pacman99 force-pushed the mkdevos branch from 8813db9 to 9e15491 Compare March 23, 2021 20:17

Pacman99 added 2 commits March 24, 2021 15:52

Move all flake creation logic to lib as mkDevos and use evalDevosArgs

01d4eb2

doc/start: add use-mkdevos section

b81f426

Pacman99 force-pushed the mkdevos branch from ab4d88e to b81f426 Compare March 24, 2021 22:52

Pacman99 added 5 commits March 24, 2021 23:33

drop pathOr to improve type checking and only import if path exists f…

a485d6c

…or typed options

lib/mkPkgs: get inputs as argument instead of taking from self

80f6ed7

mkSuites: update to match new evalDevosArgs

6b23bd7

mkDevos: get self argument explicitly

558b926

evalDevosArgs: switch to types.anything for packages

077cd91

Pacman99 added 5 commits March 25, 2021 13:26

add check and description to packages type

58fb2d4

add devosOptionsDoc to packages

e7f972f

add better defaults to suites and cleanup singleDoc code

6dd8438

mkDevos: add mkdevos template excluding unneeded directories

1a1a9a6

doc: update use-mkdevos with new template and other cleanups

0e19655

lib/pathsToImportedAttrs: discard string context in the names to prev…

06f9b7b

…ent flake check error

blaggacao requested changes Mar 26, 2021

View reviewed changes

Pacman99 changed the title ~~Move all implementation logic to lib and create lib function mkDevos~~ mkDevos and evalDevosArgs: Move flake implementation logic into lib Mar 26, 2021

Pacman99 mentioned this pull request Mar 26, 2021

devos-as-library #214

Closed

gytis-ivaskevicius approved these changes Mar 26, 2021

View reviewed changes

Pacman99 marked this pull request as draft March 26, 2021 19:22

Pacman99 closed this Apr 1, 2021

		@@ -0,0 +1,36 @@
		# Use mkDevos
		You can also use devos as a flake input and get the advantage of using

		tests = nixos.lib.optionalAttrs (system == "x86_64-linux")
		(import "${devos}/tests" { inherit self pkgs; });

mkDevos and evalDevosArgs: Move flake implementation logic into lib #206

mkDevos and evalDevosArgs: Move flake implementation logic into lib #206

Conversation

Pacman99 commented Mar 20, 2021 • edited Loading

nrdxp commented Mar 21, 2021

blaggacao left a comment

Choose a reason for hiding this comment

gytis-ivaskevicius commented Mar 21, 2021

blaggacao commented Mar 22, 2021 • edited Loading

Pacman99 commented Mar 22, 2021

blaggacao commented Mar 22, 2021

nrdxp commented Mar 23, 2021

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Pacman99 commented Mar 23, 2021

bors bot commented Mar 23, 2021

try

Pacman99 commented Mar 23, 2021

bors bot commented Mar 23, 2021

try

Pacman99 commented Mar 24, 2021 • edited Loading

Pacman99 commented Mar 25, 2021

Pacman99 commented Mar 25, 2021

Pacman99 commented Mar 26, 2021 • edited Loading

blaggacao commented Mar 26, 2021

blaggacao left a comment • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

blaggacao Mar 26, 2021 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

devos.lib

Choose a reason for hiding this comment

Choose a reason for hiding this comment

blaggacao Mar 24, 2021 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

blaggacao Mar 24, 2021 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Pacman99 Mar 27, 2021 • edited Loading

Choose a reason for hiding this comment

blaggacao Mar 24, 2021 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

blaggacao left a comment

Choose a reason for hiding this comment

blaggacao Mar 26, 2021 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

blaggacao Mar 26, 2021 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

blaggacao Mar 26, 2021 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

blaggacao Mar 26, 2021 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

blaggacao commented Mar 26, 2021 • edited Loading

blaggacao commented Mar 26, 2021 • edited Loading

gytis-ivaskevicius left a comment

Choose a reason for hiding this comment

Pacman99 commented Mar 20, 2021 •

edited

Loading

blaggacao commented Mar 22, 2021 •

edited

Loading

Pacman99 commented Mar 24, 2021 •

edited

Loading

Pacman99 commented Mar 26, 2021 •

edited

Loading

blaggacao left a comment •

edited

Loading

blaggacao Mar 26, 2021 •

edited

Loading

`devos.lib`

blaggacao Mar 24, 2021 •

edited

Loading

blaggacao Mar 24, 2021 •

edited

Loading

Pacman99 Mar 27, 2021 •

edited

Loading

blaggacao Mar 24, 2021 •

edited

Loading

blaggacao Mar 26, 2021 •

edited

Loading

blaggacao Mar 26, 2021 •

edited

Loading

blaggacao Mar 26, 2021 •

edited

Loading

blaggacao Mar 26, 2021 •

edited

Loading

blaggacao commented Mar 26, 2021 •

edited

Loading

blaggacao commented Mar 26, 2021 •

edited

Loading

Pacman99 Mar 26, 2021 •

edited

Loading

Pacman99 Mar 26, 2021 •

edited

Loading