From 8a05729f0b84488239da0deeb8a3759f74e20e37 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sun, 14 Jan 2024 13:01:24 -0300 Subject: [PATCH 01/12] live555: migrate to by-name --- .../live555/default.nix => by-name/li/live555/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{development/libraries/live555/default.nix => by-name/li/live555/package.nix} (100%) diff --git a/pkgs/development/libraries/live555/default.nix b/pkgs/by-name/li/live555/package.nix similarity index 100% rename from pkgs/development/libraries/live555/default.nix rename to pkgs/by-name/li/live555/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 79239e00c3e1..5b5a4ad42576 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23823,8 +23823,6 @@ with pkgs; litehtml = callPackage ../development/libraries/litehtml { }; - live555 = callPackage ../development/libraries/live555 { }; - llhttp = callPackage ../development/libraries/llhttp { }; log4cpp = callPackage ../development/libraries/log4cpp { }; From 11e9dd4d26fd4ae723e02e018e79d5b94b33ba27 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sun, 14 Jan 2024 12:59:32 -0300 Subject: [PATCH 02/12] live555: refactor - finalAttrs design pattern - new download stream - strictDeps - get rid of nested with --- pkgs/by-name/li/live555/package.nix | 63 ++++++++++++++++------------- 1 file changed, 35 insertions(+), 28 deletions(-) diff --git a/pkgs/by-name/li/live555/package.nix b/pkgs/by-name/li/live555/package.nix index 369e9ff825f7..7ce51b21d62e 100644 --- a/pkgs/by-name/li/live555/package.nix +++ b/pkgs/by-name/li/live555/package.nix @@ -1,29 +1,34 @@ { lib -, stdenv -, fetchurl , darwin +, fetchurl , openssl - -# major and only downstream dependency +, stdenv , vlc }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "live555"; version = "2023.05.10"; src = fetchurl { urls = [ - "http://www.live555.com/liveMedia/public/live.${version}.tar.gz" - "https://download.videolan.org/contrib/live555/live.${version}.tar.gz" - "mirror://sourceforge/slackbuildsdirectlinks/live.${version}.tar.gz" + "http://www.live555.com/liveMedia/public/live.${finalAttrs.version}.tar.gz" + "https://src.rrz.uni-hamburg.de/files/src/live555/live.${finalAttrs.version}.tar.gz" + "https://download.videolan.org/contrib/live555/live.${finalAttrs.version}.tar.gz" + "mirror://sourceforge/slackbuildsdirectlinks/live.${finalAttrs.version}.tar.gz" ]; - sha256 = "sha256-6ph9x4UYELkkJVIE9r25ycc5NOYbPcgAy9LRZebvGFY="; + hash = "sha256-6ph9x4UYELkkJVIE9r25ycc5NOYbPcgAy9LRZebvGFY="; }; - nativeBuildInputs = lib.optional stdenv.isDarwin darwin.cctools; + nativeBuildInputs = lib.optionals stdenv.isDarwin [ + darwin.cctools + ]; - buildInputs = [ openssl ]; + buildInputs = [ + openssl + ]; + + strictDeps = true; postPatch = '' substituteInPlace config.macosx-catalina \ @@ -33,43 +38,45 @@ stdenv.mkDerivation rec { sed -i \ -e 's/$(INCLUDES) -I. -O2 -DSOCKLEN_T/$(INCLUDES) -I. -O2 -I. -fPIC -DRTSPCLIENT_SYNCHRONOUS_INTERFACE=1 -DSOCKLEN_T/g' \ config.linux - '' # condition from icu/base.nix - + lib.optionalString (stdenv.hostPlatform.libc == "glibc" || stdenv.hostPlatform.libc == "musl") '' + '' + # condition from icu/base.nix + + lib.optionalString (stdenv.hostPlatform.libc == "glibc" + || stdenv.hostPlatform.libc == "musl") '' substituteInPlace liveMedia/include/Locale.hh \ --replace '' '' ''; - configurePhase = '' + configurePhase = let + platform = if stdenv.isLinux + then "linux" + else if stdenv.isDarwin + then "macosx-catalina" + else throw "Unsupported platform: ${stdenv.hostPlatform.system}"; + in '' runHook preConfigure - ./genMakefiles ${ - if stdenv.isLinux then - "linux" - else if stdenv.isDarwin then - "macosx-catalina" - else - throw "Unsupported platform ${stdenv.hostPlatform.system}"} + ./genMakefiles ${platform} runHook postConfigure ''; makeFlags = [ - "DESTDIR=${placeholder "out"}" - "PREFIX=" + "PREFIX=${placeholder "out"}" ]; enableParallelBuilding = true; passthru.tests = { + # Downstream dependency inherit vlc; }; - meta = with lib; { + meta = { homepage = "http://www.live555.com/liveMedia/"; description = "Set of C++ libraries for multimedia streaming, using open standard protocols (RTP/RTCP, RTSP, SIP)"; changelog = "http://www.live555.com/liveMedia/public/changelog.txt"; - license = licenses.lgpl21Plus; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = platforms.unix; + license = with lib.licenses; [ lgpl21Plus ]; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.unix; }; -} +}) From a09b74ea0f977c89843a4697c5654e9a0adb8441 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Fri, 19 Jan 2024 10:06:10 -0300 Subject: [PATCH 03/12] live555: 2023.05.10 -> 2023.06.08 --- pkgs/by-name/li/live555/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/live555/package.nix b/pkgs/by-name/li/live555/package.nix index 7ce51b21d62e..b3e5c00e3ec9 100644 --- a/pkgs/by-name/li/live555/package.nix +++ b/pkgs/by-name/li/live555/package.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "live555"; - version = "2023.05.10"; + version = "2023.06.08"; src = fetchurl { urls = [ @@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: { "https://download.videolan.org/contrib/live555/live.${finalAttrs.version}.tar.gz" "mirror://sourceforge/slackbuildsdirectlinks/live.${finalAttrs.version}.tar.gz" ]; - hash = "sha256-6ph9x4UYELkkJVIE9r25ycc5NOYbPcgAy9LRZebvGFY="; + hash = "sha256-2wSFscP41idx21a+Q8WPkHCLGd+fLnwwpTToOtiwxb8="; }; nativeBuildInputs = lib.optionals stdenv.isDarwin [ From 122a1aed68bf9a307df66f4c53d31d88934f1bcf Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Fri, 19 Jan 2024 10:09:21 -0300 Subject: [PATCH 04/12] live555: 2023.06.08 -> 2023.06.10 --- pkgs/by-name/li/live555/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/live555/package.nix b/pkgs/by-name/li/live555/package.nix index b3e5c00e3ec9..ad0b4e5417fd 100644 --- a/pkgs/by-name/li/live555/package.nix +++ b/pkgs/by-name/li/live555/package.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "live555"; - version = "2023.06.08"; + version = "2023.06.10"; src = fetchurl { urls = [ @@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: { "https://download.videolan.org/contrib/live555/live.${finalAttrs.version}.tar.gz" "mirror://sourceforge/slackbuildsdirectlinks/live.${finalAttrs.version}.tar.gz" ]; - hash = "sha256-2wSFscP41idx21a+Q8WPkHCLGd+fLnwwpTToOtiwxb8="; + hash = "sha256-tXvvu59HFZinDq5mpuhUjimblS+cmXFp9RYAyyji+Oo="; }; nativeBuildInputs = lib.optionals stdenv.isDarwin [ From 288ec35926f87276af4819878ace8a3c449d5bf6 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Fri, 19 Jan 2024 10:11:57 -0300 Subject: [PATCH 05/12] live555: 2023.06.10 -> 2023.06.14 --- pkgs/by-name/li/live555/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/live555/package.nix b/pkgs/by-name/li/live555/package.nix index ad0b4e5417fd..3cbbd1566d70 100644 --- a/pkgs/by-name/li/live555/package.nix +++ b/pkgs/by-name/li/live555/package.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "live555"; - version = "2023.06.10"; + version = "2023.06.14"; src = fetchurl { urls = [ @@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: { "https://download.videolan.org/contrib/live555/live.${finalAttrs.version}.tar.gz" "mirror://sourceforge/slackbuildsdirectlinks/live.${finalAttrs.version}.tar.gz" ]; - hash = "sha256-tXvvu59HFZinDq5mpuhUjimblS+cmXFp9RYAyyji+Oo="; + hash = "sha256-PaXSJwz8LwezgXWVga9g2S5kK+YPSRVnrhaH/5UT0mE="; }; nativeBuildInputs = lib.optionals stdenv.isDarwin [ From 52ad5515a037c76a4e77b4fb53e2511ec7c09c13 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Fri, 19 Jan 2024 10:24:24 -0300 Subject: [PATCH 06/12] live555: 2023.06.14 -> 2023.06.16 - Patch to accept CFLAGS in Darwin platforms - Set C++ standard to c++20 --- pkgs/by-name/li/live555/package.nix | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/live555/package.nix b/pkgs/by-name/li/live555/package.nix index 3cbbd1566d70..884c7d88064e 100644 --- a/pkgs/by-name/li/live555/package.nix +++ b/pkgs/by-name/li/live555/package.nix @@ -1,6 +1,7 @@ { lib , darwin , fetchurl +, fetchpatch , openssl , stdenv , vlc @@ -8,7 +9,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "live555"; - version = "2023.06.14"; + version = "2023.06.16"; src = fetchurl { urls = [ @@ -17,9 +18,17 @@ stdenv.mkDerivation (finalAttrs: { "https://download.videolan.org/contrib/live555/live.${finalAttrs.version}.tar.gz" "mirror://sourceforge/slackbuildsdirectlinks/live.${finalAttrs.version}.tar.gz" ]; - hash = "sha256-PaXSJwz8LwezgXWVga9g2S5kK+YPSRVnrhaH/5UT0mE="; + hash = "sha256-DBtKTklgj3AUA2lU0xsF14EmJtSR3iFL24I6nQTE9T8="; }; + patches = [ + (fetchpatch { + name = "cflags-when-darwin.patch"; + url = "https://github.com/rgaufman/live555/commit/16701af5486bb3a2d25a28edaab07789c8a9ce57.patch?full_index=1"; + hash = "sha256-IDSdByBu/EBLsUTBe538rWsDwH61RJfAEhvT68Nb9rU="; + }) + ]; + nativeBuildInputs = lib.optionals stdenv.isDarwin [ darwin.cctools ]; @@ -30,6 +39,10 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; + # Since NIX_CFLAGS_COMPILE does not differentiate C and C++ toolchains, we + # set CXXFLAGS directly + env.CXXFLAGS = "-std=c++20"; + postPatch = '' substituteInPlace config.macosx-catalina \ --replace '/usr/lib/libssl.46.dylib' "${lib.getLib openssl}/lib/libssl.dylib" \ From 1481f9e79d44a49daa3461a6ed1b6c50f98081f2 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Fri, 19 Jan 2024 10:32:39 -0300 Subject: [PATCH 07/12] live555: 2023.06.16 -> 2023.06.20 --- pkgs/by-name/li/live555/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/live555/package.nix b/pkgs/by-name/li/live555/package.nix index 884c7d88064e..e3eca2c19386 100644 --- a/pkgs/by-name/li/live555/package.nix +++ b/pkgs/by-name/li/live555/package.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "live555"; - version = "2023.06.16"; + version = "2023.06.20"; src = fetchurl { urls = [ @@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: { "https://download.videolan.org/contrib/live555/live.${finalAttrs.version}.tar.gz" "mirror://sourceforge/slackbuildsdirectlinks/live.${finalAttrs.version}.tar.gz" ]; - hash = "sha256-DBtKTklgj3AUA2lU0xsF14EmJtSR3iFL24I6nQTE9T8="; + hash = "sha256-TXl+al+M/VcFHNWAcrm8n2ZX3qPxzibpAe+4dNM5G7o="; }; patches = [ From 1b26dd2cbcdbde5a50f0624d5f54bf4164b783ad Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Fri, 19 Jan 2024 10:40:48 -0300 Subject: [PATCH 08/12] live555: 2023.06.20 -> 2023.07.24 --- pkgs/by-name/li/live555/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/live555/package.nix b/pkgs/by-name/li/live555/package.nix index e3eca2c19386..a66de1d25502 100644 --- a/pkgs/by-name/li/live555/package.nix +++ b/pkgs/by-name/li/live555/package.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "live555"; - version = "2023.06.20"; + version = "2023.07.24"; src = fetchurl { urls = [ @@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: { "https://download.videolan.org/contrib/live555/live.${finalAttrs.version}.tar.gz" "mirror://sourceforge/slackbuildsdirectlinks/live.${finalAttrs.version}.tar.gz" ]; - hash = "sha256-TXl+al+M/VcFHNWAcrm8n2ZX3qPxzibpAe+4dNM5G7o="; + hash = "sha256-LiIlZ49ihK3pO6hVjcWj5TyERAj8GURXEXU2ngYFUc4="; }; patches = [ From 9152b697fa424fe07749a7b1c9a0b92a1bac523d Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Fri, 19 Jan 2024 10:42:08 -0300 Subject: [PATCH 09/12] live555: 2023.07.24 -> 2023.10.30 --- pkgs/by-name/li/live555/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/live555/package.nix b/pkgs/by-name/li/live555/package.nix index a66de1d25502..b2594151d127 100644 --- a/pkgs/by-name/li/live555/package.nix +++ b/pkgs/by-name/li/live555/package.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "live555"; - version = "2023.07.24"; + version = "2023.10.30"; src = fetchurl { urls = [ @@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: { "https://download.videolan.org/contrib/live555/live.${finalAttrs.version}.tar.gz" "mirror://sourceforge/slackbuildsdirectlinks/live.${finalAttrs.version}.tar.gz" ]; - hash = "sha256-LiIlZ49ihK3pO6hVjcWj5TyERAj8GURXEXU2ngYFUc4="; + hash = "sha256-9R5fLWrgG8CWFrXcOUZOKLKt+zgy9G+ioLAhxatOwOs="; }; patches = [ From 96201c8acc0552e207a45eb28e38c40f74169feb Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Fri, 19 Jan 2024 11:00:24 -0300 Subject: [PATCH 10/12] live555: 2023.10.30 -> 2023.11.07 --- pkgs/by-name/li/live555/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/live555/package.nix b/pkgs/by-name/li/live555/package.nix index b2594151d127..d0e40f0818a9 100644 --- a/pkgs/by-name/li/live555/package.nix +++ b/pkgs/by-name/li/live555/package.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "live555"; - version = "2023.10.30"; + version = "2023.11.07"; src = fetchurl { urls = [ @@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: { "https://download.videolan.org/contrib/live555/live.${finalAttrs.version}.tar.gz" "mirror://sourceforge/slackbuildsdirectlinks/live.${finalAttrs.version}.tar.gz" ]; - hash = "sha256-9R5fLWrgG8CWFrXcOUZOKLKt+zgy9G+ioLAhxatOwOs="; + hash = "sha256-jd1cpRRAqcmrHZBuF6euA3YPtU08yZCdz/smfSvO+RE="; }; patches = [ From 3d359ac7725aebb883a08de9bad154a3364ef7eb Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Fri, 19 Jan 2024 11:12:00 -0300 Subject: [PATCH 11/12] live555: 2023.11.07 -> 2023.11.08 --- pkgs/by-name/li/live555/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/live555/package.nix b/pkgs/by-name/li/live555/package.nix index d0e40f0818a9..db1fc4fc1f84 100644 --- a/pkgs/by-name/li/live555/package.nix +++ b/pkgs/by-name/li/live555/package.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "live555"; - version = "2023.11.07"; + version = "2023.11.08"; src = fetchurl { urls = [ @@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: { "https://download.videolan.org/contrib/live555/live.${finalAttrs.version}.tar.gz" "mirror://sourceforge/slackbuildsdirectlinks/live.${finalAttrs.version}.tar.gz" ]; - hash = "sha256-jd1cpRRAqcmrHZBuF6euA3YPtU08yZCdz/smfSvO+RE="; + hash = "sha256-erRHznHhUaEELDf4rsjQrGvs9IZnAkGz5krnxSDklIY="; }; patches = [ From 5f3f093c013877f5f85ebb1a1d53aaeeb93f6f63 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Fri, 19 Jan 2024 11:22:14 -0300 Subject: [PATCH 12/12] live555: 2023.11.08 -> 2023.11.30 --- pkgs/by-name/li/live555/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/live555/package.nix b/pkgs/by-name/li/live555/package.nix index db1fc4fc1f84..b08ed44f4854 100644 --- a/pkgs/by-name/li/live555/package.nix +++ b/pkgs/by-name/li/live555/package.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "live555"; - version = "2023.11.08"; + version = "2023.11.30"; src = fetchurl { urls = [ @@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: { "https://download.videolan.org/contrib/live555/live.${finalAttrs.version}.tar.gz" "mirror://sourceforge/slackbuildsdirectlinks/live.${finalAttrs.version}.tar.gz" ]; - hash = "sha256-erRHznHhUaEELDf4rsjQrGvs9IZnAkGz5krnxSDklIY="; + hash = "sha256-xue+9YtdAM2XkzAY6dU2PZ3n6bvPwlULIHqBqc8wuSU="; }; patches = [