MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-17 07:13:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #7194 from nslqqq/i3update

Browse source 
i3: 4.9.1 -> 4.10.1
This commit is contained in:
Domen Kožar 2015-04-11 07:36:12 -04:00
commit a9bcb92cb3
2 changed files with 14 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pkgs/applications/window-managers/i3/default.nix
View file

@ -1,14 +1,15 @@
{ fetchurl, stdenv, which, pkgconfig, makeWrapper, libxcb, xcbutilkeysyms { fetchurl, stdenv, which, pkgconfig, makeWrapper, libxcb, xcbutilkeysyms
, xcbutil, xcbutilwm, libstartup_notification, libX11, pcre, libev, yajl , 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 { stdenv.mkDerivation rec {
name = "i3-${version}"; name = "i3-${version}";
version = "4.9.1"; version = "4.10.1";
src = fetchurl { src = fetchurl {
url = "http://i3wm.org/downloads/${name}.tar.bz2"; url = "http://i3wm.org/downloads/${name}.tar.bz2";
sha256 = "0hyw2rdxigiklqvv7fbhcdqdxkgcxvx56vk4r5v55l674zqfy3dp"; sha256 = "1qjpbrfy5pnk5d0dh9zs96ppw3jwad1jcy529zy4ja68mdgz6b8b";
}; };
buildInputs = [ buildInputs = [
@ -16,6 +17,7 @@ stdenv.mkDerivation rec {
libstartup_notification libX11 pcre libev yajl xcb-util-cursor perl pango libstartup_notification libX11 pcre libev yajl xcb-util-cursor perl pango
perlPackages.AnyEventI3 perlPackages.X11XCB perlPackages.IPCRun perlPackages.AnyEventI3 perlPackages.X11XCB perlPackages.IPCRun
perlPackages.ExtUtilsPkgConfig perlPackages.TestMore perlPackages.InlineC perlPackages.ExtUtilsPkgConfig perlPackages.TestMore perlPackages.InlineC
xorgserver xvfb_run
]; ];
postPatch = '' postPatch = ''
@ -26,8 +28,7 @@ stdenv.mkDerivation rec {
checkPhase = stdenv.lib.optionalString (stdenv.system == "x86_64-linux") checkPhase = stdenv.lib.optionalString (stdenv.system == "x86_64-linux")
'' ''
ln -sf "${xdummy}/bin/xdummy" testcases/Xdummy (cd testcases && xvfb-run ./complete-run.pl -p 1)
(cd testcases && perl complete-run.pl -p 1)
! grep -q '^not ok' testcases/latest/complete-run.log ! grep -q '^not ok' testcases/latest/complete-run.log
''; '';

16
pkgs/top-level/perl-packages.nix
View file

@ -104,11 +104,11 @@ let self = _self // overrides; _self = with self; {
propagatedBuildInputs = [ pkgs.pkgconfig pkgs.gtk2 pkgs.wxGTK ModulePluggable ]; propagatedBuildInputs = [ pkgs.pkgconfig pkgs.gtk2 pkgs.wxGTK ModulePluggable ];
}; };
AnyEvent = buildPerlPackage { AnyEvent = buildPerlPackage rec {
name = "AnyEvent-7.07"; name = "AnyEvent-7.08";
src = fetchurl { src = fetchurl {
url = mirror://cpan/authors/id/M/ML/MLEHMANN/AnyEvent-7.07.tar.gz; url = "mirror://cpan/authors/id/M/ML/MLEHMANN/${name}.tar.gz";
sha256 = "01iilh11xc2gw6fxxr6il3r6n1k4cf6swaddgbhi525wfzlchk2c"; sha256 = "16nnqzxy5baiar6gxnq5w296mmjgijcn1jq8rp867nksph03mxz8";
}; };
meta = { meta = {
maintainers = with maintainers; [ ocharles ]; maintainers = with maintainers; [ ocharles ];
@ -117,10 +117,10 @@ let self = _self // overrides; _self = with self; {
}; };
AnyEventI3 = buildPerlPackage rec { AnyEventI3 = buildPerlPackage rec {
name = "AnyEvent-I3-0.15"; name = "AnyEvent-I3-0.16";
src = fetchurl { src = fetchurl {
url = "mirror://cpan/authors/id/M/MS/MSTPLBG/${name}.tar.gz"; url = "mirror://cpan/authors/id/M/MS/MSTPLBG/${name}.tar.gz";
sha256 = "0x8zi06667bdgaxn7driqx0d71mp6021r51hdzmj5m5qbhi2hvqi"; sha256 = "1qwva5vmmn929l6k9wzhp4h80ad4qm4m1g2dyv4nlas624003hig";
}; };
propagatedBuildInputs = [ AnyEvent JSONXS ]; propagatedBuildInputs = [ AnyEvent JSONXS ];
meta = { meta = {
@ -10567,10 +10567,10 @@ let self = _self // overrides; _self = with self; {
}; };
X11XCB = buildPerlPackage rec { X11XCB = buildPerlPackage rec {
name = "X11-XCB-0.11"; name = "X11-XCB-0.12";
src = fetchurl { src = fetchurl {
url = "mirror://cpan/authors/id/M/MS/MSTPLBG/${name}.tar.gz"; url = "mirror://cpan/authors/id/M/MS/MSTPLBG/${name}.tar.gz";
sha256 = "18i3z1fzw76kl9n5driys12r6vhp3r6rmb2pjn5nc7m9n4bwgh38"; sha256 = "15jq55qcc27s5bn925pwry0vx2f4d42rlyz2hlfglnn2qnhsp37s";
}; };
AUTOMATED_TESTING = false; AUTOMATED_TESTING = false;
buildInputs = [ buildInputs = [