From c7c2cdefe8afc89b7263d155efe4b0aaca6d9952 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 20 Feb 2025 00:59:31 +0000 Subject: [PATCH 1/2] rpm: 4.20.0 -> 4.20.1 --- pkgs/tools/package-management/rpm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/rpm/default.nix b/pkgs/tools/package-management/rpm/default.nix index 522e21459f34..188155a34617 100644 --- a/pkgs/tools/package-management/rpm/default.nix +++ b/pkgs/tools/package-management/rpm/default.nix @@ -37,11 +37,11 @@ stdenv.mkDerivation rec { pname = "rpm"; - version = "4.20.0"; + version = "4.20.1"; src = fetchurl { url = "https://ftp.osuosl.org/pub/rpm/releases/rpm-${lib.versions.majorMinor version}.x/rpm-${version}.tar.bz2"; - hash = "sha256-Vv92OM/5i1bUp1A/9ZvHnygabd/82g0jjAgr7ftfvns="; + hash = "sha256-UmR+EmODZFM6tnHLyOSFyW+fCIidk/4O0QSmYyZhEk8="; }; postPatch = '' From 403908058a679038321fc9d3c9eac262f589aade Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sun, 9 Mar 2025 00:13:17 +0100 Subject: [PATCH 2/2] rpm: fix darwin build --- pkgs/tools/package-management/rpm/default.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/package-management/rpm/default.nix b/pkgs/tools/package-management/rpm/default.nix index 188155a34617..dbf483500adf 100644 --- a/pkgs/tools/package-management/rpm/default.nix +++ b/pkgs/tools/package-management/rpm/default.nix @@ -44,10 +44,16 @@ stdenv.mkDerivation rec { hash = "sha256-UmR+EmODZFM6tnHLyOSFyW+fCIidk/4O0QSmYyZhEk8="; }; - postPatch = '' - sed -i 's#''${Python3_SITEARCH}#${placeholder "out"}/${python3.sitePackages}#' python/CMakeLists.txt - sed -i 's#PATHS ENV MYPATH#PATHS ENV PATH#' CMakeLists.txt - ''; + postPatch = + '' + sed -i 's#''${Python3_SITEARCH}#${placeholder "out"}/${python3.sitePackages}#' python/CMakeLists.txt + sed -i 's#PATHS ENV MYPATH#PATHS ENV PATH#' CMakeLists.txt + '' + # clang: error: unknown argument: '-fhardened' + + lib.optionalString stdenv.cc.isClang '' + substituteInPlace CMakeLists.txt \ + --replace-fail "-fhardened" "" + ''; outputs = [