Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Jump to bottom

update digga #403

Merged
merged 3 commits into from
Dec 29, 2021
Merged

update digga #403

merged 3 commits into from
Dec 29, 2021

Conversation

blaggacao
Copy link
Contributor

  • rm: use of patched nix for nixos 21.11 enabled digga
  • fix: rm hm enableFlakes
  • imp: move follows responsibility downstream

@blaggacao
Copy link
Contributor Author

blaggacao commented Nov 30, 2021 •
edited
Loading

This is the necessary companion of #115

This flake.lock file is already in a shape as if that PR had been merged, despite currently pointing to digga.url = "github:divnix/digga"; - little trick.

teutat3s
teutat3s reviewed Nov 30, 2021
View reviewed changes
Copy link
Contributor

@teutat3s teutat3s left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, nice cleanup, only two small questions.

flake.lock Outdated
"repo": "digga",
"rev": "a55450a16d362b6e1c50bb4025aaa604b385d3ba",
"narHash": "sha256-rjVhPGMc58j8AE/FSmIrSyNSDN51o0Ooob0oRh/kq/U=",
"path": "/home/blaggacao/src/github.com/divnix/digga",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Intentionally left path here?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oops ;-)

flake.lock Outdated
"type": "path"
},
"original": {
"path": "/home/blaggacao/src/github.com/divnix/digga",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ditto?

@benneti
Copy link
Contributor

benneti commented Nov 30, 2021 •
edited
Loading

I think during this update https://github.com/divnix/devos/blob/main/overlays/various-flake-fixes.nix should be deleted as this attr is depreciated and not necessary anymore

EDIT: ignore this I think it is only depreciated on master/unstable not for 21.11 yet...

EDIT2: never the less I needed

final: prev: {
  nix-direnv = prev.nix-direnv.override { nixStable = prev.nixUnstable; };
}

instead of using the option to get use flake to work for some reason.

@codygman codygman mentioned this pull request Dec 10, 2021
Closed
@Pacman99
Copy link
Member

Is this ready to be merged? I think this should fix digga CI.

@cawilliamson cawilliamson mentioned this pull request Dec 25, 2021
Closed
@Pacman99
Copy link
Member

bors try

bors bot added a commit that referenced this pull request Dec 27, 2021
@bors
Try #403:
ca97946
@bors
Copy link
Contributor

bors bot commented Dec 27, 2021

try

Build failed:

@Pacman99
Copy link
Member

bors try

bors bot added a commit that referenced this pull request Dec 27, 2021
@bors
Try #403:
e078f85
@bors
Copy link
Contributor

bors bot commented Dec 27, 2021

try

Build failed:

@Pacman99 Pacman99 mentioned this pull request Dec 29, 2021
Closed
@Pacman99
Copy link
Member

bors try

bors bot added a commit that referenced this pull request Dec 29, 2021
@bors
Try #403:
a1156c6
@bors
Copy link
Contributor

bors bot commented Dec 29, 2021

try

Build failed:

@Pacman99
Copy link
Member

bors try

bors bot added a commit that referenced this pull request Dec 29, 2021
@bors
Try #403:
2a999e1
@bors
Copy link
Contributor

bors bot commented Dec 29, 2021

try

Build succeeded:

@Pacman99
Copy link
Member

bors try

bors bot added a commit that referenced this pull request Dec 29, 2021
@bors
Try #403:
859bc7a
@bors
Copy link
Contributor

bors bot commented Dec 29, 2021

try

Build failed:

@Pacman99
Copy link
Member

bors try

bors bot added a commit that referenced this pull request Dec 29, 2021
@bors
Try #403:
52d6e30
@bors
Copy link
Contributor

bors bot commented Dec 29, 2021

try

Build failed:

@Pacman99
Copy link
Member

bors try

bors bot added a commit that referenced this pull request Dec 29, 2021
@bors
Try #403:
3d64e18
@bors
Copy link
Contributor

bors bot commented Dec 29, 2021

try

Build failed:

@Pacman99
Copy link
Member

bors try

bors bot added a commit that referenced this pull request Dec 29, 2021
@bors
Try #403:
e810e43
@bors
Copy link
Contributor

bors bot commented Dec 29, 2021

try

Build failed:

@Pacman99
Copy link
Member

bors try

bors bot added a commit that referenced this pull request Dec 29, 2021
@bors
Try #403:
8c015cf
@bors
Copy link
Contributor

bors bot commented Dec 29, 2021

try

Build failed:

@Pacman99
Copy link
Member

bors try

bors bot added a commit that referenced this pull request Dec 29, 2021
@bors
Try #403:
e867334
@Pacman99
Copy link
Member

All the checks work locally on my system, I think this is an issue with the cache, so I'm going to go ahead and merge.

@blaggacao @Pacman99
rm: use of patched nix for nixos 21.11 enabled digga
6151d02 
- patched nix held the follows patch which is now upstreamed
@blaggacao @Pacman99
nix-direnv: rm enableFlakes and pass nixUnstable
838bcd1 
>        Failed assertions:
       - The option definition `programs.direnv.nix-direnv.enableFlakes' in `/nix/store/pv3vi4n7x83r4sc3ljqdgg9qifr4n5gp-source/users/profiles/direnv' no longer has any effect; please remove it.
       Flake support is now always enabled.
@blaggacao @Pacman99
imp: move follows responsibility downstream
a319aed 
- also remove unimportant (small) depenencies from follows management
- so that it is less complex as errors occur, since:
- it seems there are still follows issues present upstream
@Pacman99 Pacman99 merged commit 3587d67 into main Dec 29, 2021
@bors
Copy link
Contributor

bors bot commented Dec 29, 2021

try

Build failed:

@Pacman99 Pacman99 mentioned this pull request Dec 29, 2021
Closed
@teutat3s teutat3s mentioned this pull request Jan 1, 2022
Closed
@Pacman99 Pacman99 deleted the update-digga branch April 1, 2022 18:20
# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers

@teutat3s teutat3s teutat3s left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@blaggacao @benneti @Pacman99 @teutat3s