From 812eb880a42885c3da968345981c3d1bb25cc435 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Thu, 14 Nov 2024 18:03:51 +0100
Subject: [PATCH 1/3] snapper: 0.11.2 -> 0.12.0

---
 pkgs/by-name/sn/snapper/package.nix | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/sn/snapper/package.nix b/pkgs/by-name/sn/snapper/package.nix
index 41184f33ae41..e6615aab92c2 100644
--- a/pkgs/by-name/sn/snapper/package.nix
+++ b/pkgs/by-name/sn/snapper/package.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation rec {
   pname = "snapper";
-  version = "0.11.2";
+  version = "0.12.0";
 
   src = fetchFromGitHub {
     owner = "openSUSE";
     repo = "snapper";
     rev = "v${version}";
-    sha256 = "sha256-U948AmyQ6c5+FCrDijOVLc/p2wwbq5IWwS66x+O960Y=";
+    sha256 = "sha256-Hh5etDx7nLBYC6VLeZS4F52w2VpaA4aZRvGUQ0QGBJc=";
   };
 
   strictDeps = true;
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
 
   postPatch = ''
     # Hard-coded root paths, hard-coded root paths everywhere...
-    for file in {client,data,pam,scripts,zypp-plugin}/Makefile.am; do
+    for file in {client,client/installation-helper,client/systemd-helper,data,pam,scripts,zypp-plugin}/Makefile.am; do
       substituteInPlace $file \
         --replace '$(DESTDIR)/usr' "$out" \
         --replace "DESTDIR" "out" \
@@ -48,8 +48,6 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  env.NIX_CFLAGS_COMPILE = "-I${libxml2.dev}/include/libxml2";
-
   postInstall = ''
     rm -r $out/etc/cron.*
     patchShebangs $out/lib/zypp/plugins/commit/*

From a761c58c5349692e9bb7e06451549ff7e20c8b1a Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Thu, 14 Nov 2024 18:05:45 +0100
Subject: [PATCH 2/3] snapper: apply nixfmt

---
 pkgs/by-name/sn/snapper/package.nix | 56 +++++++++++++++++++++++------
 1 file changed, 46 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/sn/snapper/package.nix b/pkgs/by-name/sn/snapper/package.nix
index e6615aab92c2..3097ce0a3fef 100644
--- a/pkgs/by-name/sn/snapper/package.nix
+++ b/pkgs/by-name/sn/snapper/package.nix
@@ -1,8 +1,29 @@
-{ lib, stdenv, fetchFromGitHub
-, autoreconfHook, pkg-config, docbook_xsl, libxslt, docbook_xml_dtd_45
-, acl, attr, boost, btrfs-progs, coreutils, dbus, diffutils, e2fsprogs, libxml2
-, lvm2, pam, util-linux, json_c, nixosTests
-, ncurses, zlib }:
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  autoreconfHook,
+  pkg-config,
+  docbook_xsl,
+  libxslt,
+  docbook_xml_dtd_45,
+  acl,
+  attr,
+  boost,
+  btrfs-progs,
+  coreutils,
+  dbus,
+  diffutils,
+  e2fsprogs,
+  libxml2,
+  lvm2,
+  pam,
+  util-linux,
+  json_c,
+  nixosTests,
+  ncurses,
+  zlib,
+}:
 
 stdenv.mkDerivation rec {
   pname = "snapper";
@@ -18,12 +39,27 @@ stdenv.mkDerivation rec {
   strictDeps = true;
 
   nativeBuildInputs = [
-    autoreconfHook pkg-config
-    docbook_xsl libxslt docbook_xml_dtd_45
+    autoreconfHook
+    pkg-config
+    docbook_xsl
+    libxslt
+    docbook_xml_dtd_45
   ];
   buildInputs = [
-    acl attr boost btrfs-progs dbus diffutils e2fsprogs libxml2
-    lvm2 pam util-linux json_c ncurses zlib
+    acl
+    attr
+    boost
+    btrfs-progs
+    dbus
+    diffutils
+    e2fsprogs
+    libxml2
+    lvm2
+    pam
+    util-linux
+    json_c
+    ncurses
+    zlib
   ];
 
   passthru.tests.snapper = nixosTests.snapper;
@@ -41,7 +77,7 @@ stdenv.mkDerivation rec {
   '';
 
   configureFlags = [
-    "--disable-ext4"	# requires patched kernel & e2fsprogs
+    "--disable-ext4" # requires patched kernel & e2fsprogs
     "DIFFBIN=${diffutils}/bin/diff"
     "RMBIN=${coreutils}/bin/rm"
   ];

From 97d4d8ab63bd8f368f40296176dbaf8bb13199f4 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Thu, 14 Nov 2024 18:07:08 +0100
Subject: [PATCH 3/3] snapper: remove nested with from meta

---
 pkgs/by-name/sn/snapper/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/sn/snapper/package.nix b/pkgs/by-name/sn/snapper/package.nix
index 3097ce0a3fef..478c7f53afb9 100644
--- a/pkgs/by-name/sn/snapper/package.nix
+++ b/pkgs/by-name/sn/snapper/package.nix
@@ -96,12 +96,12 @@ stdenv.mkDerivation rec {
     done
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Tool for Linux filesystem snapshot management";
     homepage = "http://snapper.io";
-    license = licenses.gpl2Only;
+    license = lib.licenses.gpl2Only;
     mainProgram = "snapper";
-    maintainers = with maintainers; [ markuskowa ];
-    platforms = platforms.linux;
+    maintainers = with lib.maintainers; [ markuskowa ];
+    platforms = lib.platforms.linux;
   };
 }