Unverified Commit f329f668 authored by 7c6f434c's avatar 7c6f434c Committed by GitHub
Browse files

tfp-hpa: 5.2 -> 5.2-untagged-2024-06-10 (#369712)

parents 3b734b74 88bf350b

pkgs/applications/video/mplayer/default.nix

+5 −4
Original line number Diff line number Diff line
@@ -120,12 +120,12 @@ in 


stdenv.mkDerivation rec {

  pname = "mplayer";

  version = "1.5-unstable-2024-07-03";

  version = "1.5-unstable-2024-12-21";



  src = fetchsvn {

    url = "svn://svn.mplayerhq.hu/mplayer/trunk";

    rev = "38637";

    hash = "sha256-9KQOB6QIs1VZhazJqW8dY4ASiMgoxV6davfpKgLPbmE=";

    rev = "38668";

    hash = "sha256-ezWYBkhiSBgf/SeTrO6sKGbL/IrX+82KXCIlqYMEtgY=";

  };



  prePatch = ''
@@ -276,7 +276,8 @@ stdenv.mkDerivation rec { 
    description = "Movie player that supports many video formats";

    homepage = "http://mplayerhq.hu";

    license = licenses.gpl2Only;

    maintainers = [ ];

    # Picking it up: no idea about the origin of some choices (but seems fine)

    maintainers = [ maintainers.raskin ];

    platforms = [

      "i686-linux"

      "x86_64-linux"

pkgs/by-name/tf/tftp-hpa/package.nix

+17 −5
Original line number Diff line number Diff line 
{

  lib,

  stdenv,

  fetchurl,

  fetchgit,

  autoconf,

  automake,

}:



stdenv.mkDerivation rec {

  pname = "tftp-hpa";

  version = "5.2";

  src = fetchurl {

    url = "mirror://kernel/software/network/tftp/tftp-hpa/${pname}-${version}.tar.xz";

    sha256 = "12vidchglhyc20znq5wdsbhi9mqg90jnl7qr9qs8hbvaz4fkdvmg";

  version = "5.2-untagged-2024-06-10";

  src = fetchgit {

    url = "git://git.kernel.org/pub/scm/network/tftp/tftp-hpa.git";

    hash = "sha256-lTMldYO/cZdLj0UjOPPBHfYf2GBG0O+5lhP9ikqn3tY=";

    rev = "2c86ff58dcc003107b47f2d35aa0fdc4a3fd95e1";

  };



  # Workaround build failure on -fno-common toolchains like upstream
@@ -18,6 +21,15 @@ stdenv.mkDerivation rec { 
  #     `toplevel'; tftp.o:/build/tftp-hpa-5.2/tftp/tftp.c:51: first defined here

  env.NIX_CFLAGS_COMPILE = "-fcommon";



  preConfigure = ''

    ./autogen.sh

  '';



  nativeBuildInputs = [

    autoconf

    automake

  ];



  meta = with lib; {

    description = "TFTP tools - a lot of fixes on top of BSD TFTP";

    maintainers = with maintainers; [ raskin ];