Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

[LW-10649] Fix installing & running with strict AppArmor #3207

Merged
merged 9 commits into from
Aug 5, 2024
Merged

[LW-10649] Fix installing & running with strict AppArmor #3207

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
d17ba50
[LW-10649] Fix installing & running with strict AppArmor
michalrus Jun 27, 2024
4b5094d
[LW-10649] Conform to the expectations of the already deployed update…
michalrus Jul 4, 2024
fbca8aa
[LW-10649] Add progress, update from the portable variant, incl. rest…
michalrus Jul 9, 2024
fa13182
[LW-10649] Stop cardano-node when restarting during auto-update
michalrus Jul 10, 2024
054405c
[LW-10649] Remove old unused code
michalrus Jul 10, 2024
b1441dd
[LW-10649] Add the SSE4 check back
michalrus Jul 19, 2024
ab60ea2
[LW-10649] Remove the commented out `safeExitWithCode`
michalrus Jul 19, 2024
c30dced
[LW-10649] Run the SSE4 check only outside of nix-chroot
michalrus Jul 19, 2024
2da96b5
Merge branch 'develop' into chore/LW-10649-no-nix-chroot
michalrus Aug 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

## vNext

### Fixes

- Fixed installation and running on Ubuntu 24.04 LTS with AppArmor enabled by removing the `chroot` ([PR 3207](https://github.com/input-output-hk/daedalus/pull/3207))

## 5.4.0

### Fixes
Expand Down
17 changes: 17 additions & 0 deletions flake.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
tullia.flake = false; # otherwie, +1k dependencies in flake.lock…
flake-compat.url = "github:input-output-hk/flake-compat";
flake-compat.flake = false;
nix-bundle-exe.url = "github:3noch/nix-bundle-exe";
nix-bundle-exe.flake = false;
};

outputs = inputs: let
Expand Down
62 changes: 0 additions & 62 deletions installers/nix/linux.nix
View file
Open in desktop

This file was deleted.

200 changes: 0 additions & 200 deletions installers/nix/nix-installer.nix
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion nix/devshells.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ let
darwin.cctools
xcbuild
] else [
internal.electronBin
internal.relocatableElectron
winePackages.minimal
]));
name = "daedalus";
Expand Down
1 change: 1 addition & 0 deletions nix/internal/common.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,7 @@ rec {
srcWithoutNix = pkgs.lib.cleanSourceWith {
src = inputs.self;
filter = name: type: !(type == "regular" && (
pkgs.lib.hasInfix "-source/nix/" name ||
pkgs.lib.hasSuffix ".nix" name ||
pkgs.lib.hasSuffix ".hs" name ||
pkgs.lib.hasSuffix ".cabal" name
Expand Down
Loading
Loading