From ea3e1e0ec2e92f5b38e1da8717fa40379a36272b Mon Sep 17 00:00:00 2001 From: kyehn Date: Fri, 26 Sep 2025 11:34:27 +0800 Subject: [PATCH] snapper: 0.12.2 -> 0.13.0 Diff: https://github.com/openSUSE/snapper/compare/v0.12.2...v0.13.0 --- pkgs/by-name/sn/snapper/package.nix | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/pkgs/by-name/sn/snapper/package.nix b/pkgs/by-name/sn/snapper/package.nix index 4288805cf4db..6ba1469b2ca1 100644 --- a/pkgs/by-name/sn/snapper/package.nix +++ b/pkgs/by-name/sn/snapper/package.nix @@ -25,15 +25,15 @@ zlib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "snapper"; - version = "0.12.2"; + version = "0.13.0"; src = fetchFromGitHub { owner = "openSUSE"; repo = "snapper"; - rev = "v${version}"; - sha256 = "sha256-SHwF9FMfrrf2IXrGjT/lTI8rDltVkRXkAQ9MpeNVeWw="; + tag = "v${finalAttrs.version}"; + hash = "sha256-8rIjfulMuh4HzZv08bX7gveJAo2X2GvswmBD3Ziu0NM="; }; strictDeps = true; @@ -62,18 +62,14 @@ stdenv.mkDerivation rec { zlib ]; - passthru.tests.snapper = nixosTests.snapper; - + # Hard-coded root paths, hard-coded root paths everywhere... postPatch = '' - # Hard-coded root paths, hard-coded root paths everywhere... - for file in {client,client/installation-helper,client/systemd-helper,data,pam,scripts,zypp-plugin}/Makefile.am; do + for file in {client/installation-helper,client/systemd-helper,data,scripts,zypp-plugin,scripts/completion}/Makefile.am; do substituteInPlace $file \ - --replace '$(DESTDIR)/usr' "$out" \ - --replace "DESTDIR" "out" \ - --replace "/usr" "$out" + --replace-warn '$(DESTDIR)/usr' "$out" \ + --replace-warn "DESTDIR" "out" \ + --replace-warn "/usr" "$out" done - substituteInPlace pam/Makefile.am \ - --replace '/`basename $(libdir)`' "$out/lib" ''; configureFlags = [ @@ -92,10 +88,12 @@ stdenv.mkDerivation rec { $out/lib/systemd/system/* \ $out/share/dbus-1/system-services/* \ ; do - substituteInPlace $file --replace "/usr" "$out" + substituteInPlace $file --replace-warn "/usr" "$out" done ''; + passthru.tests.snapper = nixosTests.snapper; + meta = { description = "Tool for Linux filesystem snapshot management"; homepage = "http://snapper.io"; @@ -104,4 +102,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ markuskowa ]; platforms = lib.platforms.linux; }; -} +})