Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 2e05653e7f70
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1b28e47ae107
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Dec 18, 2019

  1. xorg.xf86-video-intel: 2018-12-03 -> 2019-12-09

    @infinisil
    infinisil committed Dec 18, 2019
    Copy the full SHA
    9888686 View commit details

Commits on Jan 9, 2020

  1. xorg.xf86-video-intel: 2018-12-03 -> 2019-12-09 (#75852) 

    xorg.xf86-video-intel: 2018-12-03 -> 2019-12-09
    @infinisil
    infinisil authored Jan 9, 2020
    Copy the full SHA
    1b28e47 View commit details
Showing with 9 additions and 6 deletions.
  1. +9 −6 pkgs/servers/x11/xorg/overrides.nix
15 changes: 9 additions & 6 deletions pkgs/servers/x11/xorg/overrides.nix
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ abiCompat ? null,
stdenv, makeWrapper, fetchurl, fetchpatch, buildPackages,
stdenv, makeWrapper, fetchurl, fetchpatch, fetchFromGitLab, buildPackages,
automake, autoconf, gettext, libiconv, libtool, intltool,
freetype, tradcpp, fontconfig, meson, ninja, ed,
libGL, spice-protocol, zlib, libGLU, dbus, libunwind, libdrm,
@@ -745,11 +745,14 @@ self: super:

xf86videointel = super.xf86videointel.overrideAttrs (attrs: {
# the update script only works with released tarballs :-/
name = "xf86-video-intel-2018-12-03";
src = fetchurl {
url = "http://cgit.freedesktop.org/xorg/driver/xf86-video-intel/snapshot/"
+ "e5ff8e1828f97891c819c919d7115c6e18b2eb1f.tar.gz";
sha256 = "01136zljk6liaqbk8j9m43xxzqj6xy4v50yjgi7l7g6pp8pw0gx6";
name = "xf86-video-intel-2019-12-09";
src = fetchFromGitLab {
domain = "gitlab.freedesktop.org";
group = "xorg";
owner = "driver";
repo = "xf86-video-intel";
rev = "f66d39544bb8339130c96d282a80f87ca1606caf";
sha256 = "14rwbbn06l8qpx7s5crxghn80vgcx8jmfc7qvivh72d81r0kvywl";
};
buildInputs = attrs.buildInputs ++ [self.libXfixes self.libXScrnSaver self.pixman];
nativeBuildInputs = attrs.nativeBuildInputs ++ [autoreconfHook self.utilmacros];