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: a41a2375c951
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0f05f224fa0c
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Nov 18, 2020

  1. fribidi: 1.0.7 -> 1.0.10 

    https://github.com/fribidi/fribidi/releases/tag/v1.0.8
https://github.com/fribidi/fribidi/releases/tag/v1.0.9
https://github.com/fribidi/fribidi/releases/tag/v1.0.10
    @TredwellGit @FRidh
    TredwellGit authored and FRidh committed Nov 18, 2020
    Copy the full SHA
    0f05f22 View commit details
Showing with 3 additions and 12 deletions.
  1. +3 −12 pkgs/development/libraries/fribidi/default.nix
15 changes: 3 additions & 12 deletions pkgs/development/libraries/fribidi/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
{ stdenv
, fetchurl
, fetchpatch
, meson
, ninja
, pkgconfig
@@ -10,24 +9,16 @@

stdenv.mkDerivation rec {
pname = "fribidi";
version = "1.0.7";
version = "1.0.10";

outputs = [ "out" "devdoc" ];

# NOTE: Only URL tarball has "Have pre-generated man pages: true", which works-around upstream usage of some rare ancient `c2man` fossil application.
src = fetchurl {
url = "https://github.com/fribidi/fribidi/releases/download/v${version}/${pname}-${version}.tar.bz2";
sha256 = "0pckda4fcn0aw32lpycwdp25r2m7vca8zspq815ppi9gkwgg5das";
url = "https://github.com/fribidi/fribidi/releases/download/v${version}/${pname}-${version}.tar.xz";
sha256 = "009wcpgk4jj5x52skjkfs6xar6x38mcngs75rb59nj9ig1y6h73z";
};

patches = [
(fetchpatch {
name = "CVE-2019-18397.patch";
url = "https://github.com/fribidi/fribidi/commit/034c6e9a1d296286305f4cfd1e0072b879f52568.patch";
sha256 = "102xrbf1l5gvavkxd6csx8pj3rlgcw10c0y4h4d40yhn84b1p0y8";
})
];

postPatch = ''
patchShebangs test
'';