public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #119615 from Synthetica9/cage-0.1.3 

cage: 0.1.2.1 -> 0.1.3
This commit is contained in:
Michael Weiss 2021-04-30 16:27:11 +02:00 committed by GitHub
parent 0c9ed22e64 28b8cff301
commit 774550baf5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/tests/all-tests.nix
View File

@ -47,7 +47,7 @@ in
buildkite-agents = handleTest ./buildkite-agents.nix {}; buildkite-agents = handleTest ./buildkite-agents.nix {};
caddy = handleTest ./caddy.nix {}; caddy = handleTest ./caddy.nix {};
cadvisor = handleTestOn ["x86_64-linux"] ./cadvisor.nix {}; cadvisor = handleTestOn ["x86_64-linux"] ./cadvisor.nix {};
cage = handleTest ./cage.nix {}; cage = handleTestOn ["x86_64-linux"] ./cage.nix {};
cagebreak = handleTest ./cagebreak.nix {}; cagebreak = handleTest ./cagebreak.nix {};
calibre-web = handleTest ./calibre-web.nix {}; calibre-web = handleTest ./calibre-web.nix {};
cassandra_2_1 = handleTest ./cassandra.nix { testPackage = pkgs.cassandra_2_1; }; cassandra_2_1 = handleTest ./cassandra.nix { testPackage = pkgs.cassandra_2_1; };

5
nixos/tests/cage.nix
View File

@ -25,6 +25,11 @@ import ./make-test-python.nix ({ pkgs, ...} :
testScript = { nodes, ... }: let testScript = { nodes, ... }: let
user = nodes.machine.config.users.users.alice; user = nodes.machine.config.users.users.alice;
in '' in ''
# Need to switch to a different VGA card / GPU driver because Cage segfaults with the default one (std):
# machine # [ 14.355893] .cage-wrapped[736]: segfault at 20 ip 00007f035fa0d8c7 sp 00007ffce9e4a2f0 error 4 in libwlroots.so.8[7f035fa07000+5a000]
# machine # [ 14.358108] Code: 4f a8 ff ff eb aa 0f 1f 44 00 00 c3 0f 1f 80 00 00 00 00 41 54 49 89 f4 55 31 ed 53 48 89 fb 48 8d 7f 18 48 8d 83 b8 00 00 00 <80> 7f 08 00 75 0d 48 83 3f 00 0f 85 91 00 00 00 48 89 fd 48 83 c7
os.environ["QEMU_OPTS"] = "-vga virtio"
with subtest("Wait for cage to boot up"): with subtest("Wait for cage to boot up"):
start_all() start_all()
machine.wait_for_file("/run/user/${toString user.uid}/wayland-0.lock") machine.wait_for_file("/run/user/${toString user.uid}/wayland-0.lock")

9
pkgs/applications/window-managers/cage/default.nix
View File

@ -8,20 +8,15 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "cage"; pname = "cage";
version = "0.1.2.1"; version = "0.1.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Hjdskes"; owner = "Hjdskes";
repo = "cage"; repo = "cage";
rev = "v${version}"; rev = "v${version}";
sha256 = "1i4rm3dpmk7gkl6hfs6a7vwz76ba7yqcdp63nlrdbnq81m9cy2am"; sha256 = "0ixl45g0m8b75gvbjm3gf5qg0yplspgs0xpm2619wn5sygc47sb1";
}; };
postPatch = ''
substituteInPlace meson.build --replace \
"0.1.2" "${version}"
'';
nativeBuildInputs = [ meson ninja pkg-config wayland scdoc makeWrapper ]; nativeBuildInputs = [ meson ninja pkg-config wayland scdoc makeWrapper ];
buildInputs = [ buildInputs = [

4
pkgs/top-level/all-packages.nix
View File

@ -22325,9 +22325,7 @@ in
caerbannog = callPackage ../applications/misc/caerbannog { }; caerbannog = callPackage ../applications/misc/caerbannog { };
cage = callPackage ../applications/window-managers/cage { cage = callPackage ../applications/window-managers/cage { };
wlroots = wlroots_0_12;
};
calf = callPackage ../applications/audio/calf { calf = callPackage ../applications/audio/calf {
inherit (gnome2) libglade; inherit (gnome2) libglade;