momo/main: merge main branch #219

Merged

b12f merged 13 commits from momo-merge-main into momo/main 2023-04-24 10:50:48 +00:00

Conversation 0 Commits 13 Files changed 28 +75 -364

teutat3s commented 2023-04-17 12:46:46 +00:00

Owner

Copy link

No description provided.

teutat3s added 11 commits 2023-04-17 12:46:47 +00:00

flake: pull in changes from digga upstream ... d0470d5aaf

See:
54ede8e591...0595ae70cd?diff=unified

audio: disable useless bluetooth sap plugin b01c5f9fce

cachix: remove unused binary caches b1ad71cd35

cachix: default binary cache is nixos.org, no need ... 972e3f1569

to specify it explicitly (results in double entry in nix.conf)

Also force our nix.extraOptions because digga tries real hard to put
their binary caches there:
0595ae70cd/modules/nix-config.nix (L19-L23)

nix.conf: add back required experimental features 52c2ca9f13

ci: cleanup unused directories 3bdc4b1f39

cachix: remove unused binary caches from drone ... 3ea141d445

runner

Merge pull request 'flake: pull in changes from digga upstream' (#207) from upstream/digga-changes into main ... 9f7d209392

Reviewed-on: #207
Reviewed-by: hensoko <hensoko@gssws.de>

Merge pull request 'audio: disable useless bluetooth sap plugin' (#208) from audio/disable-bluetooth-sap-plugin into main ... 76d8af7c3a

Reviewed-on: #208
Reviewed-by: hensoko <hensoko@gssws.de>

Merge pull request 'cachix: remove unused binary caches' (#209) from cachix/remove-unused-caches into main ... 029be00eab

Reviewed-on: #209
Reviewed-by: hensoko <hensoko@gssws.de>

Merge branch 'main' into momo-merge-main a779fc0466

teutat3s force-pushed momo-merge-main from a779fc0466 to 4faf4267a3 2023-04-18 08:53:44 +00:00 Compare

b12f approved these changes 2023-04-24 10:50:42 +00:00

b12f merged commit 211f1d16d0 into momo/main 2023-04-24 10:50:48 +00:00

b12f deleted branch momo-merge-main 2023-04-24 10:50:48 +00:00

b12f referenced this pull request from a commit 2023-04-24 10:50:49 +00:00

Merge pull request 'momo/main: merge main branch' (#219) from momo-merge-main into momo/main

Sign in to join this conversation.

Reviewers

No reviewers

b12f

Labels

Clear labels   

bug

Something is not working

  

duplicate

This issue or pull request already exists

  

enhancement

New feature

  

help wanted

Need some help

  

invalid

Something is wrong

  

question

More information is needed

  

wontfix

This won't be fixed

No labels

bug

duplicate

enhancement

help wanted

invalid

question

wontfix

Milestone

Clear milestone

No items

No milestone

Projects

Clear projects

No items

No project

Assignees

Clear assignees

No assignees

2 participants

Notifications

Subscribe

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: pub-solar/os#219

No description provided.