bup: move to pkgs/by-name and reformat (881aca9e) · Commits · nix / nixpkgs

pkgs/tools/backup/bup/default.nix→pkgs/by-name/bu/bup/package.nix

+34 −8

Original line number	Diff line number	Diff line
		{ lib, stdenv, fetchFromGitHub, makeWrapper
		, perl, pandoc, python3, git
		, par2cmdline ? null, par2Support ? true
		{
		lib,
		stdenv,
		fetchFromGitHub,
		makeWrapper,
		perl,
		pandoc,
		python3,
		git,

		par2Support ? true,
		par2cmdline ? null,
		}:

		assert par2Support -> par2cmdline != null;
		@@ -8,8 +17,17 @@ assert par2Support -> par2cmdline != null;
		let
		version = "0.33.4";

		pythonDeps = with python3.pkgs; [ setuptools tornado ]
		++ lib.optionals (!stdenv.isDarwin) [ pyxattr pylibacl fuse ];
		pythonDeps =
		with python3.pkgs;
		[
		setuptools
		tornado
		]
		++ lib.optionals (!stdenv.isDarwin) [
		pyxattr
		pylibacl
		fuse
		];
		in

		stdenv.mkDerivation {
		@@ -23,8 +41,15 @@ stdenv.mkDerivation {
		hash = "sha256-9rWzHONcu4W/JcnDUGPbuGksroODbhdL6bNF+3Dd2ag=";
		};

		buildInputs = [ git python3 ];
		nativeBuildInputs = [ pandoc perl makeWrapper ];
		buildInputs = [
		git
		python3
		];
		nativeBuildInputs = [
		pandoc
		perl
		makeWrapper
		];

		postPatch = "patchShebangs .";

		@@ -37,7 +62,8 @@ stdenv.mkDerivation {
		"LIBDIR=$(out)/lib/bup"
		];

		env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=implicit-function-declaration -Wno-error=implicit-int";
		env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang
		"-Wno-error=implicit-function-declaration -Wno-error=implicit-int";

		postInstall = ''
		wrapProgram $out/bin/bup \

+0 −2

Original line number	Diff line number	Diff line
		@@ -6360,8 +6360,6 @@ with pkgs;

		bumpver = callPackage ../applications/version-management/bumpver { };

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

		bupstash = darwin.apple_sdk_11_0.callPackage ../tools/backup/bupstash { };

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