From 48a5db6c56b87569d9da951a5ce25924830b2782 Mon Sep 17 00:00:00 2001 From: Nikita Mikhailov Date: Sat, 11 Apr 2015 12:41:59 +0200 Subject: [PATCH 1/2] perl: Update deps for i3wm --- pkgs/top-level/perl-packages.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index b3ccf597728..3f9bd62a4e0 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -104,11 +104,11 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ pkgs.pkgconfig pkgs.gtk2 pkgs.wxGTK ModulePluggable ]; }; - AnyEvent = buildPerlPackage { - name = "AnyEvent-7.07"; + AnyEvent = buildPerlPackage rec { + name = "AnyEvent-7.08"; src = fetchurl { - url = mirror://cpan/authors/id/M/ML/MLEHMANN/AnyEvent-7.07.tar.gz; - sha256 = "01iilh11xc2gw6fxxr6il3r6n1k4cf6swaddgbhi525wfzlchk2c"; + url = "mirror://cpan/authors/id/M/ML/MLEHMANN/${name}.tar.gz"; + sha256 = "16nnqzxy5baiar6gxnq5w296mmjgijcn1jq8rp867nksph03mxz8"; }; meta = { maintainers = with maintainers; [ ocharles ]; @@ -117,10 +117,10 @@ let self = _self // overrides; _self = with self; { }; AnyEventI3 = buildPerlPackage rec { - name = "AnyEvent-I3-0.15"; + name = "AnyEvent-I3-0.16"; src = fetchurl { url = "mirror://cpan/authors/id/M/MS/MSTPLBG/${name}.tar.gz"; - sha256 = "0x8zi06667bdgaxn7driqx0d71mp6021r51hdzmj5m5qbhi2hvqi"; + sha256 = "1qwva5vmmn929l6k9wzhp4h80ad4qm4m1g2dyv4nlas624003hig"; }; propagatedBuildInputs = [ AnyEvent JSONXS ]; meta = { @@ -10541,10 +10541,10 @@ let self = _self // overrides; _self = with self; { }; X11XCB = buildPerlPackage rec { - name = "X11-XCB-0.11"; + name = "X11-XCB-0.12"; src = fetchurl { url = "mirror://cpan/authors/id/M/MS/MSTPLBG/${name}.tar.gz"; - sha256 = "18i3z1fzw76kl9n5driys12r6vhp3r6rmb2pjn5nc7m9n4bwgh38"; + sha256 = "15jq55qcc27s5bn925pwry0vx2f4d42rlyz2hlfglnn2qnhsp37s"; }; AUTOMATED_TESTING = false; buildInputs = [ From 93f277f1d4a250cedf0dbbe520ff34c75b7f200c Mon Sep 17 00:00:00 2001 From: Nikita Mikhailov Date: Sun, 5 Apr 2015 19:46:45 +0200 Subject: [PATCH 2/2] i3: 4.9.1 -> 4.10.1 --- pkgs/applications/window-managers/i3/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix index a8d2b42bb3b..43d3865035a 100644 --- a/pkgs/applications/window-managers/i3/default.nix +++ b/pkgs/applications/window-managers/i3/default.nix @@ -1,14 +1,15 @@ { fetchurl, stdenv, which, pkgconfig, makeWrapper, libxcb, xcbutilkeysyms , xcbutil, xcbutilwm, libstartup_notification, libX11, pcre, libev, yajl -, xcb-util-cursor, coreutils, perl, pango, perlPackages, xdummy, libxkbcommon }: +, xcb-util-cursor, coreutils, perl, pango, perlPackages, libxkbcommon +, xorgserver, xvfb_run }: stdenv.mkDerivation rec { name = "i3-${version}"; - version = "4.9.1"; + version = "4.10.1"; src = fetchurl { url = "http://i3wm.org/downloads/${name}.tar.bz2"; - sha256 = "0hyw2rdxigiklqvv7fbhcdqdxkgcxvx56vk4r5v55l674zqfy3dp"; + sha256 = "1qjpbrfy5pnk5d0dh9zs96ppw3jwad1jcy529zy4ja68mdgz6b8b"; }; buildInputs = [ @@ -16,6 +17,7 @@ stdenv.mkDerivation rec { libstartup_notification libX11 pcre libev yajl xcb-util-cursor perl pango perlPackages.AnyEventI3 perlPackages.X11XCB perlPackages.IPCRun perlPackages.ExtUtilsPkgConfig perlPackages.TestMore perlPackages.InlineC + xorgserver xvfb_run ]; postPatch = '' @@ -26,8 +28,7 @@ stdenv.mkDerivation rec { checkPhase = stdenv.lib.optionalString (stdenv.system == "x86_64-linux") '' - ln -sf "${xdummy}/bin/xdummy" testcases/Xdummy - (cd testcases && perl complete-run.pl -p 1) + (cd testcases && xvfb-run ./complete-run.pl -p 1) ! grep -q '^not ok' testcases/latest/complete-run.log '';