diff --git a/pkgs/tools/backup/bup/default.nix b/pkgs/by-name/bu/bup/package.nix similarity index 63% rename from pkgs/tools/backup/bup/default.nix rename to pkgs/by-name/bu/bup/package.nix index 07ae258a675f..91fb2b3c3f71 100644 --- a/pkgs/tools/backup/bup/default.nix +++ b/pkgs/by-name/bu/bup/package.nix @@ -1,15 +1,33 @@ -{ 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; let - version = "0.33.3"; + 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 { @@ -20,11 +38,18 @@ stdenv.mkDerivation { repo = "bup"; owner = "bup"; rev = version; - hash = "sha256-w7yPs7hG4v0Kd9i2tYhWH7vW95MAMfI/8g61MB6bfps="; + 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 \ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a365eb1d7b04..3455cf20d6e8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6319,8 +6319,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 { };