git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #119615 from Synthetica9/cage-0.1.3

cage: 0.1.2.1 -> 0.1.3

commit774550baf5d036e686b6a31cc6b3a5efdece0aca authorMichael Weiss <dev.primeos@gmail.com> dateFri 30 Apr 2021, 16:27 (6 years ago) parent0c9ed2228b8cff
4 files changed+9−11
compare with master
unifiedsplit
nixos/tests/all-tests.nix+1−1 nixos/tests/cage.nix+5 pkgs/applications/window-managers/cage/default.nix+2−7 pkgs/top-level/all-packages.nix+1−3
nixos/tests/all-tests.nix+1−1
@@ -47,7 +47,7 @@ in
4747 buildkite-agents = handleTest ./buildkite-agents.nix {};
4848 caddy = handleTest ./caddy.nix {};
4949 cadvisor = handleTestOn ["x86_64-linux"] ./cadvisor.nix {};
50− cage = handleTest ./cage.nix {};
50+ cage = handleTestOn ["x86_64-linux"] ./cage.nix {};
5151 cagebreak = handleTest ./cagebreak.nix {};
5252 calibre-web = handleTest ./calibre-web.nix {};
5353 cassandra_2_1 = handleTest ./cassandra.nix { testPackage = pkgs.cassandra_2_1; };
nixos/tests/cage.nix+5
@@ -25,6 +25,11 @@ import ./make-test-python.nix ({ pkgs, ...} :
2525 testScript = { nodes, ... }: let
2626 user = nodes.machine.config.users.users.alice;
2727 in ''
28+ # Need to switch to a different VGA card / GPU driver because Cage segfaults with the default one (std):
29+ # machine # [ 14.355893] .cage-wrapped[736]: segfault at 20 ip 00007f035fa0d8c7 sp 00007ffce9e4a2f0 error 4 in libwlroots.so.8[7f035fa07000+5a000]
30+ # 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
31+ os.environ["QEMU_OPTS"] = "-vga virtio"
32+
2833 with subtest("Wait for cage to boot up"):
2934 start_all()
3035 machine.wait_for_file("/run/user/${toString user.uid}/wayland-0.lock")
pkgs/applications/window-managers/cage/default.nix+2−7
@@ -8,20 +8,15 @@
88
99stdenv.mkDerivation rec {
1010 pname = "cage";
11− version = "0.1.2.1";
11+ version = "0.1.3";
1212
1313 src = fetchFromGitHub {
1414 owner = "Hjdskes";
1515 repo = "cage";
1616 rev = "v${version}";
17− sha256 = "1i4rm3dpmk7gkl6hfs6a7vwz76ba7yqcdp63nlrdbnq81m9cy2am";
17+ sha256 = "0ixl45g0m8b75gvbjm3gf5qg0yplspgs0xpm2619wn5sygc47sb1";
1818 };
1919
20− postPatch = ''
21− substituteInPlace meson.build --replace \
22− "0.1.2" "${version}"
23− '';
24−
2520 nativeBuildInputs = [ meson ninja pkg-config wayland scdoc makeWrapper ];
2621
2722 buildInputs = [
pkgs/top-level/all-packages.nix+1−3
@@ -22325,9 +22325,7 @@ in
2232522325
2232622326 caerbannog = callPackage ../applications/misc/caerbannog { };
2232722327
22328− cage = callPackage ../applications/window-managers/cage {
22329− wlroots = wlroots_0_12;
22330− };
22328+ cage = callPackage ../applications/window-managers/cage { };
2233122329
2233222330 calf = callPackage ../applications/audio/calf {
2233322331 inherit (gnome2) libglade;