nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-17 01:24:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #213435 from wegank/rpm-ostree-bump

Browse Source 
rpm-ostree: 2022.13 -> 2023.1
This commit is contained in:
Weijia Wang 2023-01-29 22:10:51 +01:00 committed by GitHub
commit 48fe7cfeb9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/tools/misc/rpm-ostree/default.nix
View File

@ -40,13 +40,13 @@
stdenv.mkDerivation rec {
pname = "rpm-ostree";
version = "2022.13";
version = "2023.1";
outputs = [ "out" "dev" "man" "devdoc" ];
src = fetchurl {
url = "https://github.com/coreos/${pname}/releases/download/v${version}/${pname}-${version}.tar.xz";
sha256 = "sha256-3lU+Xmfyjs6AFnf+vE5xMSAntRoNeHBVrOJZLvv1YyY=";
hash = "sha256-JNLp1IHbIRpe3Au2iUsx7x065rirQlzT9bg7CoqHCyg=";
};
nativeBuildInputs = [
@ -114,6 +114,9 @@ stdenv.mkDerivation rec {
env NOCONFIGURE=1 ./autogen.sh
'';
# https://github.com/NixOS/nixpkgs/issues/201254
NIX_LDFLAGS = lib.optionalString (stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU) "-lgcc";
meta = with lib; {
description = "A hybrid image/package system. It uses OSTree as an image format, and uses RPM as a component model";
homepage = "https://coreos.github.io/rpm-ostree/";

2
pkgs/top-level/all-packages.nix
View File

@ -11469,6 +11469,8 @@ with pkgs;
rpm-ostree = callPackage ../tools/misc/rpm-ostree {
gperf = gperf_3_0;
# https://github.com/NixOS/nixpkgs/issues/201254
stdenv = if stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU then gcc11Stdenv else stdenv;
};
rpm2targz = callPackage ../tools/archivers/rpm2targz { };