diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-12-09 21:00:07 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-12-09 21:00:07 +0100 |
| commit | 2309acf72337b49eef43d1dfc90d850d2682a4a5 (patch) | |
| tree | 645c03e7f03476375245bc064421b41329f21fb0 /pkgs/applications/version-management | |
| parent | 87317bab0a796b3c8301f27acfbf48a782d5dde0 (diff) | |
| parent | 8f4f9b62238da74bd3c78fe5708369d543c3e690 (diff) | |
| download | nixlib-2309acf72337b49eef43d1dfc90d850d2682a4a5.tar nixlib-2309acf72337b49eef43d1dfc90d850d2682a4a5.tar.gz nixlib-2309acf72337b49eef43d1dfc90d850d2682a4a5.tar.bz2 nixlib-2309acf72337b49eef43d1dfc90d850d2682a4a5.tar.lz nixlib-2309acf72337b49eef43d1dfc90d850d2682a4a5.tar.xz nixlib-2309acf72337b49eef43d1dfc90d850d2682a4a5.tar.zst nixlib-2309acf72337b49eef43d1dfc90d850d2682a4a5.zip | |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/applications/version-management')
3 files changed, 33 insertions, 2 deletions
diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 75b53d2cfe09..7056249de3fc 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -51,6 +51,10 @@ rec { git-annex = pkgs.haskellPackages.git-annex; gitAnnex = git-annex; + git-annex-metadata-gui = libsForQt5.callPackage ./git-annex-metadata-gui { + inherit (python3Packages) buildPythonApplication pyqt5 git-annex-adapter; + }; + git-annex-remote-b2 = callPackage ./git-annex-remote-b2 { }; git-annex-remote-rclone = callPackage ./git-annex-remote-rclone { }; diff --git a/pkgs/applications/version-management/git-and-tools/git-annex-metadata-gui/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex-metadata-gui/default.nix new file mode 100644 index 000000000000..ba64a065d281 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/git-annex-metadata-gui/default.nix @@ -0,0 +1,27 @@ +{ stdenv, buildPythonApplication, fetchFromGitHub, pyqt5, git-annex-adapter }: + +buildPythonApplication rec { + name = "git-annex-metadata-gui-${version}"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "alpernebbi"; + repo = "git-annex-metadata-gui"; + rev = "v${version}"; + sha256 = "03kch67k0q9lcs817906g864wwabkn208aiqvbiyqp1qbg99skam"; + }; + + prePatch = '' + substituteInPlace setup.py --replace "'PyQt5', " "" + ''; + + propagatedBuildInputs = [ pyqt5 git-annex-adapter ]; + + meta = with stdenv.lib; { + homepage = https://github.com/alpernebbi/git-annex-metadata-gui; + description = "Graphical interface for git-annex metadata commands"; + maintainers = with maintainers; [ dotlambda ]; + license = licenses.gpl3Plus; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/applications/version-management/git-and-tools/git-annex-remote-rclone/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex-remote-rclone/default.nix index d38529e92e60..c368dcd487e8 100644 --- a/pkgs/applications/version-management/git-and-tools/git-annex-remote-rclone/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-annex-remote-rclone/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { name = "git-annex-remote-rclone-${version}"; - version = "0.5"; + version = "0.6"; rev = "v${version}"; src = fetchFromGitHub { inherit rev; owner = "DanielDent"; repo = "git-annex-remote-rclone"; - sha256 = "1353b6q3lnxhpdfy9yd2af65v7aypdhyvgn7ziksmsrbi12lb74i"; + sha256 = "0j0hlxji8d974fq7zd4xc02n0jpi31ylhxc7z4zp8iiwad5mkpxp"; }; nativeBuildInputs = [ makeWrapper ]; |