about summary refs log tree commit diff
path: root/pkgs/servers/x11
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2014-05-17 07:27:29 +0200
committerVladimír Čunát <vcunat@gmail.com>2014-05-17 07:31:03 +0200
commit137eae0b55949bcfd6a2f4ba12964db8bdfae954 (patch)
tree66dd96bbf6ea56cd007e9900b1cacf39a18743cb /pkgs/servers/x11
parent4ac818601e5b38c2be4add23a2932810f977210b (diff)
downloadnixlib-137eae0b55949bcfd6a2f4ba12964db8bdfae954.tar
nixlib-137eae0b55949bcfd6a2f4ba12964db8bdfae954.tar.gz
nixlib-137eae0b55949bcfd6a2f4ba12964db8bdfae954.tar.bz2
nixlib-137eae0b55949bcfd6a2f4ba12964db8bdfae954.tar.lz
nixlib-137eae0b55949bcfd6a2f4ba12964db8bdfae954.tar.xz
nixlib-137eae0b55949bcfd6a2f4ba12964db8bdfae954.tar.zst
nixlib-137eae0b55949bcfd6a2f4ba12964db8bdfae954.zip
Merge #2630: add and use fetchpatch
fetchpatch is fetchurl that determinizes the patch.
Some parts of generated patches change from time to time, e.g. see #1983 and
http://comments.gmane.org/gmane.linux.distributions.nixos/12815
Using fetchpatch should prevent the hash from changing.

Conflicts (auto-solved):
	pkgs/development/libraries/haskell/gitit/default.nix
Diffstat (limited to 'pkgs/servers/x11')
-rw-r--r--pkgs/servers/x11/xorg/overrides.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 3f591cb7c0e3..bb97eadef462 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -178,9 +178,9 @@ in
   };
 
   xf86videonv = attrs: attrs // {
-    patches = [( args.fetchurl {
+    patches = [( args.fetchpatch {
       url = http://cgit.freedesktop.org/xorg/driver/xf86-video-nv/patch/?id=fc78fe98222b0204b8a2872a529763d6fe5048da;
-      sha256 = "0ikbnz6048ygs1qahb6ylnxkyjhfjcqr2gm9bk95ca90v57j7i0f";
+      sha256 = "0i2ddgqwj6cfnk8f4r73kkq3cna7hfnz7k3xj3ifx5v8mfiva6gw";
     })];
   };