Merge pull request 'Revert "Merge pull request 'fix/boostrap-iso' (#75) from fix/boostrap-iso into main"' (#76) from fix/revert-digga-change into main

Reviewed-on: https://git.b12f.io/pub-solar/os/pulls/76
Reviewed-by: teutat3s <teutates@mailbox.org>
This commit is contained in:
teutat3s 2022-05-02 08:30:39 +00:00
commit e3b6cca939
3 changed files with 8 additions and 8 deletions

View file

@ -123,7 +123,7 @@ steps:
- | - |
nix --print-build-logs --verbose \ nix --print-build-logs --verbose \
develop --command \ develop --command \
bud build bootstrap isoImage bud build bootstrap bootstrapIso
- cp $(readlink -f result)/iso/*.iso /var/nix/iso-cache/ - cp $(readlink -f result)/iso/*.iso /var/nix/iso-cache/
- name: "Publish ISO" - name: "Publish ISO"
@ -158,6 +158,6 @@ volumes:
--- ---
kind: signature kind: signature
hmac: 0c0731948a73c30cff44c3dbbf4d1a131680b8777d9986ca04699b9f5c82bab2 hmac: e806a6980afdc1bf451be231db1a61e7917822a1f78afe3f2136eadfd632d521
... ...

View file

@ -188,15 +188,15 @@
"nixpkgs-unstable": "nixpkgs-unstable" "nixpkgs-unstable": "nixpkgs-unstable"
}, },
"locked": { "locked": {
"lastModified": 1651349453, "lastModified": 1651210705,
"narHash": "sha256-0ZAYPYWXm16reXFT0bJi/4f6GeYubnlj2YruXcmp0hs=", "narHash": "sha256-2RzKrjEnWDhsBQ4Et2gm2LjV5pXyszeqV1xNe+LtNT8=",
"owner": "pub-solar", "owner": "divnix",
"repo": "digga", "repo": "digga",
"rev": "531dd67b7aef37d7828fb28c2e45f09de0425c6b", "rev": "0ffa2dff5ede12a03ca83fbc514972f94cf18f42",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "pub-solar", "owner": "divnix",
"repo": "digga", "repo": "digga",
"type": "github" "type": "github"
} }

View file

@ -11,7 +11,7 @@
nixos.url = "github:nixos/nixpkgs/nixos-21.11"; nixos.url = "github:nixos/nixpkgs/nixos-21.11";
latest.url = "github:nixos/nixpkgs/nixos-unstable"; latest.url = "github:nixos/nixpkgs/nixos-unstable";
digga.url = "github:pub-solar/digga"; digga.url = "github:divnix/digga";
digga.inputs.nixpkgs.follows = "nixos"; digga.inputs.nixpkgs.follows = "nixos";
digga.inputs.nixlib.follows = "nixos"; digga.inputs.nixlib.follows = "nixos";
digga.inputs.home-manager.follows = "home"; digga.inputs.home-manager.follows = "home";