nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-25 00:12:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #131398 from alyssais/librsync

Browse Source 
btar: fix build with librsync 1.x; librsync_0_9: drop
This commit is contained in:
Sandro 2021-07-24 22:58:18 +00:00 committed by GitHub
commit 92c9175760
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 19 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
pkgs/development/libraries/librsync/0.9.nix
View File

@ -1,26 +0,0 @@
{ lib, stdenv, fetchurl }:
stdenv.mkDerivation {
name = "librsync-0.9.7";
src = fetchurl {
url = "mirror://sourceforge/librsync/librsync-0.9.7.tar.gz";
sha256 = "1mj1pj99mgf1a59q9f2mxjli2fzxpnf55233pc1klxk2arhf8cv6";
};
hardeningDisable = [ "format" ];
configureFlags = [
(lib.enableFeature stdenv.isCygwin "static")
(lib.enableFeature (!stdenv.isCygwin) "shared")
];
dontStrip = stdenv.hostPlatform != stdenv.buildPlatform;
meta = {
homepage = "http://librsync.sourceforge.net/";
license = lib.licenses.lgpl2Plus;
description = "Implementation of the rsync remote-delta algorithm";
platforms = lib.platforms.unix;
};
}

25
pkgs/tools/backup/btar/default.nix
View File

@ -1,21 +1,30 @@
{ lib, stdenv, fetchurl, librsync }:
{ lib, stdenv, fetchurl, fetchpatch, librsync }:
stdenv.mkDerivation rec {
name = "btar-1.1.1";
pname = "btar";
version = "1.1.1";
src = fetchurl {
url = "http://vicerveza.homeunix.net/~viric/soft/btar/${name}.tar.gz";
url = "https://vicerveza.homeunix.net/~viric/soft/btar/btar-${version}.tar.gz";
sha256 = "0miklk4bqblpyzh1bni4x6lqn88fa8fjn15x1k1n8bxkx60nlymd";
};
patches = [
(fetchpatch {
url = "https://build.opensuse.org/public/source/openSUSE:Factory/btar/btar-librsync.patch?rev=2";
sha256 = "1awqny9489vsfffav19s73xxg26m7zrhvsgf1wxb8c2izazwr785";
})
];
buildInputs = [ librsync ];
installPhase = "make install PREFIX=$out";
makeFlags = [ "PREFIX=$(out)" ];
meta = {
meta = with lib; {
description = "Tar-compatible block-based archiver";
license = lib.licenses.gpl3Plus;
homepage = "http://viric.name/cgi-bin/btar";
platforms = with lib.platforms; all;
maintainers = with lib.maintainers; [viric];
homepage = "https://viric.name/cgi-bin/btar";
platforms = platforms.all;
maintainers = with maintainers; [ viric ];
};
}

1
pkgs/top-level/aliases.nix
View File

@ -423,6 +423,7 @@ mapAliases ({
libqrencode = qrencode; # added 2019-01-01
librdf = lrdf; # added 2020-03-22
librecad2 = librecad; # backwards compatibility alias, added 2015-10
librsync_0_9 = throw "librsync_0_9 has been removed"; # added 2021-07-24
libseat = seatd; # added 2021-06-24
libsysfs = sysfsutils; # added 2018-04-25
libtidy = html-tidy; # added 2014-12-21

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

@ -3543,9 +3543,7 @@ in
bsdiff = callPackage ../tools/compression/bsdiff { };
btar = callPackage ../tools/backup/btar {
librsync = librsync_0_9;
};
btar = callPackage ../tools/backup/btar { };
bud = callPackage ../tools/networking/bud { };
@ -17049,8 +17047,6 @@ in
librsync = callPackage ../development/libraries/librsync { };
librsync_0_9 = callPackage ../development/libraries/librsync/0.9.nix { };
librttopo = callPackage ../development/libraries/librttopo { };
libs3 = callPackage ../development/libraries/libs3 { };