From ec0e3acd581ddf21bc4768ab545b7d57a96d3e31 Mon Sep 17 00:00:00 2001 From: Eric Bailey Date: Sun, 9 Jun 2019 22:11:57 -0500 Subject: [PATCH 1/3] xvfb_run: fix hash --- pkgs/tools/misc/xvfb-run/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/xvfb-run/default.nix b/pkgs/tools/misc/xvfb-run/default.nix index bfc2a03e6cb..779742dc79a 100644 --- a/pkgs/tools/misc/xvfb-run/default.nix +++ b/pkgs/tools/misc/xvfb-run/default.nix @@ -3,7 +3,7 @@ let xvfb_run = fetchurl { url = https://projects.archlinux.org/svntogit/packages.git/plain/trunk/xvfb-run?h=packages/xorg-server; - sha256 = "1f9mrhqy0l72i3674n98bqlq9a10h0rh9qfjiwvivz3hjhq5c0gz"; + sha256 = "1307mz4nr8ga3qz73i8hbcdphky75rq8lrvfk2zm4kmv6pkbk611"; }; in stdenv.mkDerivation { From c4be9091b3d8f3dc13c3e9ef57e2607b495b6914 Mon Sep 17 00:00:00 2001 From: Eric Bailey Date: Mon, 10 Jun 2019 05:16:56 -0500 Subject: [PATCH 2/3] xvfb_run: pin xorg-server package Co-Authored-By: Jan Tojnar --- pkgs/tools/misc/xvfb-run/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/xvfb-run/default.nix b/pkgs/tools/misc/xvfb-run/default.nix index 779742dc79a..a8999d33b44 100644 --- a/pkgs/tools/misc/xvfb-run/default.nix +++ b/pkgs/tools/misc/xvfb-run/default.nix @@ -2,7 +2,8 @@ , xauth, utillinux, which, fontsConf, gawk, coreutils }: let xvfb_run = fetchurl { - url = https://projects.archlinux.org/svntogit/packages.git/plain/trunk/xvfb-run?h=packages/xorg-server; + # https://git.archlinux.org/svntogit/packages.git/?h=packages/xorg-server + url = https://git.archlinux.org/svntogit/packages.git/plain/trunk/xvfb-run?h=packages/xorg-server&id=9cb733cefa92af3fca608fb051d5251160c9bbff; sha256 = "1307mz4nr8ga3qz73i8hbcdphky75rq8lrvfk2zm4kmv6pkbk611"; }; in From 5cc47dc5df76385e9fa8c55ca55037f70c75eb0a Mon Sep 17 00:00:00 2001 From: Eric Bailey Date: Mon, 10 Jun 2019 11:21:26 -0500 Subject: [PATCH 3/3] xvfb_run: fix name Co-Authored-By: Jan Tojnar --- pkgs/tools/misc/xvfb-run/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/misc/xvfb-run/default.nix b/pkgs/tools/misc/xvfb-run/default.nix index a8999d33b44..d6adbde5ea9 100644 --- a/pkgs/tools/misc/xvfb-run/default.nix +++ b/pkgs/tools/misc/xvfb-run/default.nix @@ -2,6 +2,7 @@ , xauth, utillinux, which, fontsConf, gawk, coreutils }: let xvfb_run = fetchurl { + name = "xvfb-run"; # https://git.archlinux.org/svntogit/packages.git/?h=packages/xorg-server url = https://git.archlinux.org/svntogit/packages.git/plain/trunk/xvfb-run?h=packages/xorg-server&id=9cb733cefa92af3fca608fb051d5251160c9bbff; sha256 = "1307mz4nr8ga3qz73i8hbcdphky75rq8lrvfk2zm4kmv6pkbk611";