cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #120210 from markuskowa/upd-snapper

Browse source 
snapper: 0.8.15 -> 0.9.0
This commit is contained in:
Sandro 2021-04-22 22:07:06 +02:00 committed by GitHub
commit 08a65f1b08
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
pkgs/tools/misc/snapper/default.nix
View file

@ -1,18 +1,18 @@
{ lib, stdenv, fetchFromGitHub { lib, stdenv, fetchFromGitHub
, autoreconfHook, pkg-config, docbook_xsl, libxslt, docbook_xml_dtd_45 , autoreconfHook, pkg-config, docbook_xsl, libxslt, docbook_xml_dtd_45
, acl, attr, boost, btrfs-progs, dbus, diffutils, e2fsprogs, libxml2 , acl, attr, boost, btrfs-progs, dbus, diffutils, e2fsprogs, libxml2
, lvm2, pam, python, util-linux, fetchpatch, json_c, nixosTests , lvm2, pam, python, util-linux, json_c, nixosTests
, ncurses }: , ncurses }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "snapper"; pname = "snapper";
version = "0.8.15"; version = "0.9.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "openSUSE"; owner = "openSUSE";
repo = "snapper"; repo = "snapper";
rev = "v${version}"; rev = "v${version}";
sha256 = "1rqv1qfxr02qbkix1mpx91s4827irxryxkhby3ii0fdkm3ympsas"; sha256 = "1gx3ichbkdqlzl7w187vc3xpmr9prmnp7as0h6ympgigradj5c7g";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -26,14 +26,6 @@ stdenv.mkDerivation rec {
passthru.tests.snapper = nixosTests.snapper; passthru.tests.snapper = nixosTests.snapper;
patches = [
# Don't use etc/dbus-1/system.d
(fetchpatch {
url = "https://github.com/openSUSE/snapper/commit/c51708aea22d9436da287cba84424557ad03644b.patch";
sha256 = "106pf7pv8z3q37c8ckmgwxs1phf2fy7l53a9g5xq5kk2rjj1cx34";
})
];
postPatch = '' postPatch = ''
# Hard-coded root paths, hard-coded root paths everywhere... # 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,data,pam,scripts,zypp-plugin}/Makefile.am; do