1
1
mirror of https://github.com/divnix/digga.git synced 2024-12-22 23:51:39 +03:00
Commit Graph

1246 Commits

Author SHA1 Message Date
Parthiv Seetharaman
e2bb8ea28c
Merge pull request #447 from divnix/use-nixos-branch
Use nixos-* not release-*
2022-04-05 22:01:32 -07:00
Parthiv Seetharaman
9ffc49fed7 Use nixos-* not release-* 2022-04-05 11:56:20 -07:00
Parthiv Seetharaman
bc10b43c99 default.nix: directly import devShell.nix 2022-04-05 11:46:02 -07:00
Parthiv Seetharaman
b5fac9c7fc examples/devos: remove bud get 2022-04-04 21:43:46 -05:00
Parthiv Seetharaman
1072583dbe fix onboarding process for pulling template 2022-04-04 21:43:46 -05:00
montchr
afa1c70e0c Update Changelog for tag 2022-04-02 22:16:32 +00:00
Parthiv Seetharaman
3da59b1e09 release workflow: change default branch to main 2022-04-01 16:32:20 -07:00
Parthiv Seetharaman
67404208d0
Merge pull request #436 from Pacman99/remove-customBuilds
Remove customBuilds, nixos-generate has --flake
2022-04-01 16:05:31 -07:00
Parthiv Seetharaman
51d8ca3fe0 Remove customBuilds, nixos-generate has --flake 2022-04-01 15:52:56 -07:00
Parthiv Seetharaman
336235e212 mdbook: update ubuntu version 2022-04-01 11:14:53 -07:00
Parthiv Seetharaman
ac9ee7af97
Merge pull request #444 from divnix/revert-devshell-subflaking
Revert devshell subflakification
2022-03-31 10:16:01 -07:00
Chris Montgomery
2fbffc323c devshell: revert subflake changes
This reverts several commits on `main`:

- 5b33c4baef
- 85496bd4de
- 94cc51e2b7
- 75c0f266f4
- 9da3840a6f
2022-03-31 10:07:34 -07:00
Chris Montgomery
94d51035da ci: use native github actions for pull request checks 2022-03-31 11:29:59 -05:00
David Arnold
9da3840a6f
fix: missing dep in CI devshell script 2022-03-27 18:43:21 -05:00
David Arnold
75c0f266f4
fix: invokation of the devshell in the pipeline 2022-03-27 18:26:51 -05:00
David Arnold
94cc51e2b7
fix: nix version in pipeline 2022-03-27 18:17:06 -05:00
David Arnold
85496bd4de
fix: pipeline 2022-03-27 18:11:57 -05:00
David Arnold
5b33c4baef
imp: separate devshell into subflake (don't dirty top-level flake inputs) 2022-03-23 16:43:09 -05:00
Parthiv Seetharaman
396b04b62b
README: fix devos-ext-lib link 2022-03-09 09:24:43 -08:00
bors[bot]
8b88f511db
Merge #441
441: fix: use gnu sed in shell tests for cross-platform compatibility r=montchr a=montchr

Darwin's use of BSD `sed` breaks here because BSD `sed` has a different
argument signature.

Spun off from #438 as suggested in https://github.com/divnix/digga/pull/438#discussion_r815551027

Co-authored-by: Chris Montgomery <chris@alley.co>
2022-03-05 21:15:50 +00:00
Chris Montgomery
7597ce22bf
fix: use gnu sed in shell tests for cross-platform compatibility
Darwin's use of BSD `sed` breaks here because BSD `sed` has a different
argument signature.
2022-03-05 12:18:48 -05:00
Parthiv Seetharaman
bfecf143c0 README: fix mkFlake link in Usage 2022-03-03 12:48:56 -08:00
Parthiv Seetharaman
2399abe440
Merge pull request #432 from Gigahawk/docs_fix
docs: update start/from-nixos
2022-02-28 14:26:01 -08:00
Chris Montgomery
091409e44a
docs: add dotfield repo to "in the wild" 2022-02-28 11:58:46 -05:00
bors[bot]
1313bfb954
Merge #439
439: Remove suites, profiles, and old importer code r=blaggacao a=Pacman99

I'm keeping the deprecation code for `externalModules` still, since there hasn't been a proper release that included that code.

Co-authored-by: Parthiv Seetharaman <pachum99@myrdd.info>
2022-02-28 13:08:46 +00:00
Chris Montgomery
7ed798faee
docs: fix some broken links in readme 2022-02-28 00:53:36 -05:00
Parthiv Seetharaman
d9a0e08149 Remove suites, profiles, and old importer code 2022-02-27 18:27:33 -08:00
bors[bot]
13a518bf14
Merge #435
435: Merge devos docs and README into top-level r=blaggacao a=Pacman99

I think some more work needs to be done to get the docs to flow better, but for now this puts everything in one place so we have a starting point to improve everything.

The new readme is a mix of what I thought were the best parts of both readmes.

Co-authored-by: Parthiv Seetharaman <pachum99@myrdd.info>
2022-02-27 01:49:39 +00:00
bors[bot]
d8a0f2d63c
Merge #433
433: Cleanup how polyfill works for digga-use outputs r=blaggacao a=Pacman99



Co-authored-by: Parthiv Seetharaman <pachum99@myrdd.info>
2022-02-26 20:32:38 +00:00
Parthiv Seetharaman
ef92bc3c73 Merge devos docs and README into top-level 2022-02-26 12:20:58 -08:00
Parthiv Seetharaman
d17be3c12b Cleanup how polyfill works for digga-use outputs 2022-02-26 12:15:37 -08:00
bors[bot]
8a77ad799f
Merge #431
431: Make this repository digga r=Pacman99 a=Pacman99

closes: #430

This is just some git hacking to preserve both project's commit histories.

Commands that I ran:
```sh
git remote add digga git@github.com:divnix/digga
git checkout -b digga-main digga/main
git checkout -b merge-digga upstream/main
mkdir ../devos
mv * .editorconfig .envrc .gitignore ../devos/
mkdir examples
mv ../devos examples/
git add . && git commit -m "tree: move everything into examples/devos"
git checkout digga-main
git rebase merge-digga # there were 3 merge conflicts with src/pkgs-lib/shell, not sure why but that file has been deleted so I just delt with them
git checkout merge-digga
git merge digga-main --ff-only
git push upstream merge-digga
```
There are a lot of changes, so it'll be easier to review what exactly I did with git to get it this way.

The only actual changes I personally made:
 - removed .gitmodules and downstream submodule
 - move devos into examples/devos
 - removed bud template from devos and added `devos` template to digga

This doesn't cover devos docs, I think we will need a separate effort to merge devos docs into digga docs. Probably as a digga usage section or something. For now devos docs are just sitting in `examples/devos`.

This PR should theoretically have the same amount of commits being added as the number of commits in digga itself. I think it ended up being around 50 less because bors commits aren't included for some reason.

Co-authored-by: Parthiv Seetharaman <pachum99@myrdd.info>
Co-authored-by: Pacman99 <pachum99@gmail.com>
Co-authored-by: David Arnold <dar@xoe.solutions>
Co-authored-by: Pacman99 <pachum99@myrdd.info>
Co-authored-by: Dusk Banks <me@bb010g.com>
Co-authored-by: Pacman99 <Pacman99@users.noreply.github.com>
2022-02-26 07:17:10 +00:00
Jasper Chan
7e394658a0 docs: update start/from-nixos 2022-02-25 02:38:24 -08:00
Parthiv Seetharaman
a792cf9935 export devos template in digga 2022-02-23 18:57:22 -08:00
Parthiv Seetharaman
38b73dddd2 examples/downstream -> examples/devos
no need for submodules either
2022-02-23 16:08:11 -08:00
Parthiv Seetharaman
a966d439da flake: switch to upstream fup
The divnix fork paches don't actually matter because we always pass fup
a channel input. Digga will error out early if there is any issues, so
fup channel input auto-detection never gets called.
2022-02-23 15:23:14 -08:00
Parthiv Seetharaman
dcf744906f mkFlake: replace config.self -> self
config.self seems to cause infinite recursion when using nix-shell in a
non-git repository
2022-02-23 15:23:14 -08:00
Parthiv Seetharaman
ad45b01534 flake: remove anti-corruption layer and use nixlib 2022-02-23 15:23:14 -08:00
Parthiv Seetharaman
38b9607613 customBuilds: use mkDefault for freeform type 2022-02-23 15:23:14 -08:00
GTrunSec
97c4ffb426 remove vm of nixos-generators.nixosModules on 22.0
5, fix #123
2022-02-23 15:23:14 -08:00
Matt Schreiber
61828b5075 fix: module args of home-manager portable configs
Type-check such configs as modules ("moduleType") rather than as
functions evaluating to attribute sets ("functionTo attrs").  This
ensures that they get invoked with all expected module arguments
("pkgs", "lib", etc.).

Update ./examples/hmOnly so that the testuser config references the pkgs
module arg, thus testing that the switch to moduleType works as
intended.

Closes #119
2022-02-23 15:23:14 -08:00
Andrew Marshall
b2e9099753 Add patches options to channels
This is available in underlying flake-utils-plus.
2022-02-23 15:23:14 -08:00
Parthiv Seetharaman
be4826d0b6 update downstream example/test 2022-02-23 15:23:14 -08:00
Timothy DeHerrera
34b01c2d37 update flake-utils-plus fork
FUP was also setting the `ca-references` option, but recently put it
behind a version check to remove it on the newest unstable.
2022-02-23 15:23:14 -08:00
Timothy DeHerrera
1b9dad8e61 nix: remove ca-references feature flag
This experimental feature has been removed from Nix in unstable
versions recently, and with this set, it now pops up an unsupressable
warning message. Not so bad on its own, but when using <kbd>Tab</kbd>
completion it corrupts the output.
2022-02-23 15:23:14 -08:00
David Arnold
8c7118298d test: fix downstream to compatible synthetic commit
- downstream used `patchedNix`.
- fix hm compatibility
2022-02-23 15:23:14 -08:00
David Arnold
cc6836d3e3 revert: 21.11 does still call nix2.4 unstable
- For "political" reasons: https://github.com/NixOS/nixpkgs/pull/147511
2022-02-23 15:23:14 -08:00
teutat3s
a100fee8f0 chore: update docs 2022-02-23 15:23:14 -08:00
teutat3s
8019c64bd8 chore: remove unused nix-patched overlay 2022-02-23 15:23:14 -08:00
teutat3s
f025da4b55 chore: flakes support arrived in nixStable, no more
patched nix. Leave commented overlay as example
2022-02-23 15:23:14 -08:00