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: 439bc5204f24
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 9419ed60f49e
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Sep 4, 2019

  1. xorg.libXt: 1.1.5 -> 1.2.0 

    https://lists.x.org/archives/xorg-announce/2019-June/003002.html
    @dtzWill
    dtzWill committed Sep 4, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    dtzWill Will Dietz
    GPG key ID: EBB0EA4124809D02
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    1cd0c20 View commit details

Commits on Oct 7, 2019

  1. Merge pull request #68069 from dtzWill/update/libxt-1.2.0 

    xorg.libXt: 1.1.5 -> 1.2.0
    @dtzWill
    dtzWill authored Oct 7, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    9419ed6 View commit details
Showing with 4 additions and 4 deletions.
  1. +3 −3 pkgs/servers/x11/xorg/default.nix
  2. +1 −1 pkgs/servers/x11/xorg/tarballs.list
6 changes: 3 additions & 3 deletions pkgs/servers/x11/xorg/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1015,11 +1015,11 @@ lib.makeScope newScope (self: with self; {
}) {};

libXt = callPackage ({ stdenv, pkgconfig, fetchurl, libICE, xorgproto, libSM, libX11 }: stdenv.mkDerivation {
name = "libXt-1.1.5";
name = "libXt-1.2.0";
builder = ./builder.sh;
src = fetchurl {
url = mirror://xorg/individual/lib/libXt-1.1.5.tar.bz2;
sha256 = "06lz6i7rbrp19kgikpaz4c97fw7n31k2h2aiikczs482g2zbdvj6";
url = mirror://xorg/individual/lib/libXt-1.2.0.tar.bz2;
sha256 = "0cbqlyssr8aia88c8i7z59z9d0kp3p2hp6683xhz9ndyv8qza7dk";
};
hardeningDisable = [ "bindnow" "relro" ];
nativeBuildInputs = [ pkgconfig ];
2 changes: 1 addition & 1 deletion pkgs/servers/x11/xorg/tarballs.list
View file
Original file line number Diff line number Diff line change
@@ -203,7 +203,7 @@ mirror://xorg/individual/lib/libXres-1.2.0.tar.bz2
mirror://xorg/individual/lib/libXScrnSaver-1.2.3.tar.bz2
mirror://xorg/individual/lib/libxshmfence-1.3.tar.bz2
mirror://xorg/individual/lib/libXTrap-1.0.1.tar.bz2
mirror://xorg/individual/lib/libXt-1.1.5.tar.bz2
mirror://xorg/individual/lib/libXt-1.2.0.tar.bz2
mirror://xorg/individual/lib/libXtst-1.2.3.tar.bz2
mirror://xorg/individual/lib/libXv-1.0.11.tar.bz2
mirror://xorg/individual/lib/libXvMC-1.0.11.tar.bz2