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

Commits on Sep 16, 2019

  1. xorg.libXfont2: 2.0.3 -> 2.0.4 

    https://lists.x.org/archives/xorg-announce/2019-September/003022.html
    @dtzWill
    dtzWill committed Sep 16, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    michaldudak Michał Dudak
    SSH Key Fingerprint: EmPQKkDPfPOGds0AT8sQn9z+SM+vFvfXjZtwxw5VVlA
    Verified
    Learn about vigilant mode
    Copy the full SHA
    c63dba2 View commit details

Commits on Oct 7, 2019

  1. Merge pull request #68912 from dtzWill/update/libxfont2-2.0.4 

    xorg.libXfont2: 2.0.3 -> 2.0.4
    @dtzWill
    dtzWill authored Oct 7, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    michaldudak Michał Dudak
    SSH Key Fingerprint: EmPQKkDPfPOGds0AT8sQn9z+SM+vFvfXjZtwxw5VVlA
    Verified
    Learn about vigilant mode
    Copy the full SHA
    917200c 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
@@ -872,11 +872,11 @@ lib.makeScope newScope (self: with self; {
}) {};

libXfont2 = callPackage ({ stdenv, pkgconfig, fetchurl, libfontenc, xorgproto, freetype, xtrans, zlib }: stdenv.mkDerivation {
name = "libXfont2-2.0.3";
name = "libXfont2-2.0.4";
builder = ./builder.sh;
src = fetchurl {
url = mirror://xorg/individual/lib/libXfont2-2.0.3.tar.bz2;
sha256 = "0klwmimmhm3axpj8pwn5l41lbggh47r5aazhw63zxkbwfgyvg2hf";
url = mirror://xorg/individual/lib/libXfont2-2.0.4.tar.bz2;
sha256 = "1rk9pjxcm01lbr1dxhnvk4f2qrn6zp068qjbvvz5w0z5d0rin5bd";
};
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
@@ -188,7 +188,7 @@ mirror://xorg/individual/lib/libXdmcp-1.1.3.tar.bz2
mirror://xorg/individual/lib/libXext-1.3.4.tar.bz2
mirror://xorg/individual/lib/libXfixes-5.0.3.tar.bz2
mirror://xorg/individual/lib/libXfont-1.5.4.tar.bz2
mirror://xorg/individual/lib/libXfont2-2.0.3.tar.bz2
mirror://xorg/individual/lib/libXfont2-2.0.4.tar.bz2
mirror://xorg/individual/lib/libXft-2.3.3.tar.bz2
mirror://xorg/individual/lib/libXi-1.7.10.tar.bz2
mirror://xorg/individual/lib/libXinerama-1.1.4.tar.bz2