Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 1a25495b6344
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d80f2e18c62c
Choose a head ref
  • 5 commits
  • 8 files changed
  • 1 contributor

Commits on Jun 26, 2017

  1. rsync: build with iconv, zlib & popt from nixpkgs 

    The rsync binary was previously built without iconv support which is needed
for utf-8 conversions on darwin. Fixes #26864.

Additionally rsync used to be built with bundled versions of zlib and popt
that were outdated. This decreases the size of the rsync binary by ~82KB.
    @fpletz
    fpletz committed Jun 26, 2017
    2

    Verified

    This commit was signed with the committer’s verified signature.
    fpletz Franz Pletz
    GPG key ID: 846FDED7792617B4
    Verified
    Learn about vigilant mode
    Copy the full SHA
    3156263 View commit details

  2. burp: 1.4.40 -> 2.0.54

    @fpletz
    fpletz committed Jun 26, 2017

    Verified

    This commit was signed with the committer’s verified signature.
    fpletz Franz Pletz
    GPG key ID: 846FDED7792617B4
    Verified
    Learn about vigilant mode
    Copy the full SHA
    356bac7 View commit details

  3. burp_1_3: remove

    @fpletz
    fpletz committed Jun 26, 2017

    Verified

    This commit was signed with the committer’s verified signature.
    fpletz Franz Pletz
    GPG key ID: 846FDED7792617B4
    Verified
    Learn about vigilant mode
    Copy the full SHA
    1a7f330 View commit details

  4. librsync: 1.0.0 -> 2.0.0

    @fpletz
    fpletz committed Jun 26, 2017

    Verified

    This commit was signed with the committer’s verified signature.
    fpletz Franz Pletz
    GPG key ID: 846FDED7792617B4
    Verified
    Learn about vigilant mode
    Copy the full SHA
    edf5cbd View commit details

  5. uthash: 1.9.9 -> 2.0.2

    @fpletz
    fpletz committed Jun 26, 2017

    Verified

    This commit was signed with the committer’s verified signature.
    fpletz Franz Pletz
    GPG key ID: 846FDED7792617B4
    Verified
    Learn about vigilant mode
    Copy the full SHA
    d80f2e1 View commit details
6 changes: 3 additions & 3 deletions pkgs/applications/networking/sync/rsync/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, perl
{ stdenv, fetchurl, perl, libiconv, zlib, popt
, enableACLs ? true, acl ? null
, enableCopyDevicesPatch ? false
}:
@@ -18,10 +18,10 @@ stdenv.mkDerivation rec {
srcs = [mainSrc] ++ stdenv.lib.optional enableCopyDevicesPatch patchesSrc;
patches = stdenv.lib.optional enableCopyDevicesPatch "./patches/copy-devices.diff";

buildInputs = stdenv.lib.optional enableACLs acl;
buildInputs = [libiconv zlib popt] ++ stdenv.lib.optional enableACLs acl;
nativeBuildInputs = [perl];

configureFlags = "--with-nobody-group=nogroup";
configureFlags = ["--with-nobody-group=nogroup" "--without-included-zlib"];

meta = base.meta // {
description = "A fast incremental file transfer utility";
13 changes: 5 additions & 8 deletions pkgs/development/libraries/librsync/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,21 +1,18 @@
{ stdenv, fetchFromGitHub, autoreconfHook, perl, zlib, bzip2, popt }:
{ stdenv, fetchFromGitHub, cmake, perl, zlib, bzip2, popt }:

stdenv.mkDerivation rec {
name = "librsync-${version}";
version = "1.0.0";
version = "2.0.0";

src = fetchFromGitHub {
owner = "librsync";
repo = "librsync";
rev = "v${version}";
sha256 = "0rc2pksdd0mhdvk8y1yix71rf19wdx1lb2ryrkhi7vcy240rvgvc";
sha256 = "0yad7nkw6d8j824qkxrj008ak2wq6yw5p894sbhr35yc1wr5mki6";
};

buildInputs = [ autoreconfHook perl zlib bzip2 popt ];

configureFlags = if stdenv.isCygwin then "--enable-static" else "--enable-shared";

CFLAGS = "-std=gnu89";
nativeBuildInputs = [ cmake ];
buildInputs = [ perl zlib bzip2 popt ];

crossAttrs = {
dontStrip = true;
4 changes: 2 additions & 2 deletions pkgs/development/libraries/uthash/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{ stdenv, fetchurl, perl }:

let
version = "1.9.9";
version = "2.0.2";
in
stdenv.mkDerivation rec {
name = "uthash-${version}";

src = fetchurl {
url = "https://github.com/troydhanson/uthash/archive/v${version}.tar.gz";
sha256 = "035z3cs5ignywgh4wqxx358a2nhn3lj0x1ifij6vj0yyyhah3wgj";
sha256 = "1la82gdlyl7m8ahdjirigwfh7zjgkc24cvydrqcri0vsvm8iv8rl";
};

dontBuild = false;
30 changes: 0 additions & 30 deletions pkgs/tools/backup/burp/1.3.48.nix
View file

This file was deleted.

12 changes: 0 additions & 12 deletions pkgs/tools/backup/burp/burp_1.3.48.patch
View file

This file was deleted.

12 changes: 0 additions & 12 deletions pkgs/tools/backup/burp/burp_1.4.40.patch
View file

This file was deleted.

28 changes: 14 additions & 14 deletions pkgs/tools/backup/burp/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
{ stdenv, fetchgit, acl, librsync, ncurses, openssl, zlib }:
{ stdenv, fetchFromGitHub, autoreconfHook
, acl, librsync, ncurses, openssl, zlib, uthash }:

stdenv.mkDerivation rec {
name = "burp-1.4.40";
name = "burp-${version}";
version = "2.0.54";

src = fetchgit {
url = "https://github.com/grke/burp.git";
rev = "1e8eebac420f2b0dc29102602b7e5e437d58d5b7";
sha256 = "02gpgcyg1x0bjk8349019zp3m002lmdhil6g6n8xv0kzz54v6gaw";
src = fetchFromGitHub {
owner = "grke";
repo = "burp";
rev = version;
sha256 = "1z1w013hqxbfjgri0fan2570qwhgwvm4k4ghajbzqg8kly4fgk5x";
};

patches = [ ./burp_1.4.40.patch ];

buildInputs = [ librsync ncurses openssl zlib ]
# next two lines copied from bacula, as burp needs acl as well
# acl relies on attr, which I can't get to build on darwin
nativeBuildInputs = [ autoreconfHook ];
buildInputs = [ librsync ncurses openssl zlib uthash ]
++ stdenv.lib.optional (!stdenv.isDarwin) acl;

configureFlags = [
"--sbindir=$out/bin"
];
configureFlags = [ "--localstatedir=/var" ];

installFlags = [ "localstatedir=/tmp" ];

meta = with stdenv.lib; {
description = "BURP - BackUp and Restore Program";
2 changes: 0 additions & 2 deletions pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -1198,8 +1198,6 @@ with pkgs;

bup = callPackage ../tools/backup/bup { };

burp_1_3 = callPackage ../tools/backup/burp/1.3.48.nix { };

burp = callPackage ../tools/backup/burp { };

buku = callPackage ../applications/misc/buku {