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: 2f7fa4bb8887
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 5748022aa3a4
Choose a head ref
  • 2 commits
  • 4 files changed
  • 2 contributors

Commits on Dec 17, 2020

  1. xorg.fonttosfnt: 1.0.5 -> 1.2.1 

    https://lists.x.org/archives/xorg-announce/2020-January/003035.html
https://lists.x.org/archives/xorg-announce/2020-October/003062.html
https://lists.x.org/archives/xorg-announce/2020-December/003068.html
    @TredwellGit
    TredwellGit committed Dec 17, 2020
    Copy the full SHA
    ad86bc7 View commit details

Commits on Jan 5, 2021

  1. Merge pull request #107117 from TredwellGit/xorg.fonttosfnt 

    xorg.fonttosfnt: 1.0.5 -> 1.2.1
    @rnhmjoj
    rnhmjoj authored Jan 5, 2021
    Copy the full SHA
    5748022 View commit details
Showing with 4 additions and 70 deletions.
  1. +3 −3 pkgs/servers/x11/xorg/default.nix
  2. +0 −61 pkgs/servers/x11/xorg/fix-uninitialised-memory.patch
  3. +0 −5 pkgs/servers/x11/xorg/overrides.nix
  4. +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
@@ -532,11 +532,11 @@ lib.makeScope newScope (self: with self; {
}) {};

fonttosfnt = callPackage ({ stdenv, pkgconfig, fetchurl, libfontenc, freetype, xorgproto }: stdenv.mkDerivation {
name = "fonttosfnt-1.0.5";
name = "fonttosfnt-1.2.1";
builder = ./builder.sh;
src = fetchurl {
url = "mirror://xorg/individual/app/fonttosfnt-1.0.5.tar.bz2";
sha256 = "00w5in1gznai141wishz8ng7spvi5274n16zj0pdl1ma2vsmy2n8";
url = "mirror://xorg/individual/app/fonttosfnt-1.2.1.tar.bz2";
sha256 = "16r51h5wfy85wnbq3q8v8a184hb25c3ksjgix0mlcywdz7qkbj07";
};
hardeningDisable = [ "bindnow" "relro" ];
nativeBuildInputs = [ pkgconfig ];
61 changes: 0 additions & 61 deletions pkgs/servers/x11/xorg/fix-uninitialised-memory.patch
View file

This file was deleted.

5 changes: 0 additions & 5 deletions pkgs/servers/x11/xorg/overrides.nix
View file
Original file line number Diff line number Diff line change
@@ -22,11 +22,6 @@ self: super:
buildInputs = attrs.buildInputs ++ [ self.xorgproto ];
});

fonttosfnt = super.fonttosfnt.overrideAttrs (attrs: {
# https://gitlab.freedesktop.org/xorg/app/fonttosfnt/merge_requests/6
patches = [ ./fix-uninitialised-memory.patch ];
});

bitmap = super.bitmap.overrideAttrs (attrs: {
nativeBuildInputs = attrs.nativeBuildInputs ++ [ makeWrapper ];
postInstall = ''
2 changes: 1 addition & 1 deletion pkgs/servers/x11/xorg/tarballs.list
View file
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@ mirror://xorg/individual/app/appres-1.0.5.tar.bz2
mirror://xorg/individual/app/bdftopcf-1.1.tar.bz2
mirror://xorg/individual/app/bitmap-1.0.9.tar.gz
mirror://xorg/individual/app/editres-1.0.7.tar.bz2
mirror://xorg/individual/app/fonttosfnt-1.0.5.tar.bz2
mirror://xorg/individual/app/fonttosfnt-1.2.1.tar.bz2
mirror://xorg/individual/app/iceauth-1.0.8.tar.bz2
mirror://xorg/individual/app/ico-1.0.5.tar.bz2
mirror://xorg/individual/app/listres-1.0.4.tar.bz2