Unverified Commit 2345d940 authored by Thomas Gerbet's avatar Thomas Gerbet Committed by GitHub
Browse files

Merge pull request #223431 from Mic92/libowfat 

libowfat: 0.32 -> 0.33
parents b6d27ebc 816a6f60

pkgs/applications/networking/p2p/opentracker/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -2,12 +2,12 @@ 


stdenv.mkDerivation {

  pname = "opentracker";

  version = "unstable-2018-05-26";

  version = "unstable-2021-08-23";



  src = fetchgit {

    url = "https://erdgeist.org/gitweb/opentracker";

    rev = "6411f1567f64248b0d145493c2e61004d2822623";

    sha256 = "110nfb6n4clykwdzpk54iccsfjawq0krjfqhg114i1z0ri5dyl8j";

    rev = "110868ec4ebe60521d5a4ced63feca6a1cf0aa2a";

    sha256 = "sha256-SuElfmk7zONolTiyg0pyvbfvyJRn3r9OrXwpTzLw8LI=";

  };



  buildInputs = [ libowfat zlib ];

pkgs/development/libraries/libowfat/default.nix

+5 −10
Original line number Diff line number Diff line
@@ -2,21 +2,13 @@ 


stdenv.mkDerivation rec {

  pname = "libowfat";

  version = "0.32";

  version = "0.33";



  src = fetchurl {

    url = "https://www.fefe.de/libowfat/${pname}-${version}.tar.xz";

    sha256 = "1hcqg7pvy093bxx8wk7i4gvbmgnxz2grxpyy7b4mphidjbcv7fgl";

    sha256 = "sha256-MR7Is/S3K7RC4yP7ATqY+Vb6dFVH8ryUVih7INAnzX0=";

  };



  patches = [

    (fetchurl {

      name = "first_deferred.patch";

      url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-libs/libowfat/files/libowfat-0.32-gcc10.patch?id=129f4ab9f8571c651937c46ba7bd4c82d6d052a2";

      sha256 = "zxWb9qq5dkDucOsiPfGG1Gb4BZ6HmhBjgSe3tBnydP4=";

    })

  ];



  # Fix for glibc 2.34 from Gentoo

  # https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=914a4aa87415dabfe77181a2365766417a5919a4

  postPatch = ''
@@ -26,6 +18,9 @@ stdenv.mkDerivation rec { 
    # remove unneeded definition of __deprecated__

    sed '/^#define __deprecated__$/d' -i scan/scan_iso8601.c scan/scan_httpdate.c || die

  '';

  preBuild = ''

    make headers

  '';



  makeFlags = [ "prefix=$(out)" ];

  enableParallelBuilding = true;