diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2014-11-14 14:28:23 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2014-11-14 14:28:23 +0100 |
| commit | b4af993c3f2a2e9808b582eb6dd4500a2847fb2b (patch) | |
| tree | 6a4d51255f30e0da26fb94d4725b6c19145bb89d /pkgs/applications/version-management | |
| parent | 5ad9db047327b74a4002341f074369ee736e4f9e (diff) | |
| parent | 961ed7c8b41bb80cdf5f4f0f5e49093ad171393b (diff) | |
Merge branch 'master' into staging
Conflicts (simple): pkgs/development/lisp-modules/clwrapper/setup-hook.sh
Diffstat (limited to 'pkgs/applications/version-management')
| -rw-r--r-- | pkgs/applications/version-management/git-and-tools/git/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/version-management/git-and-tools/github-backup/default.nix | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index fbb57a6581209..7ba69a9fc1829 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation { # Install git-subtree. pushd contrib/subtree make - make install install-doc + make install ${stdenv.lib.optionalString withManual "install-doc"} popd rm -rf contrib/subtree diff --git a/pkgs/applications/version-management/git-and-tools/github-backup/default.nix b/pkgs/applications/version-management/git-and-tools/github-backup/default.nix index 50c42c5c9d4e7..5b1e2041e4aa5 100644 --- a/pkgs/applications/version-management/git-and-tools/github-backup/default.nix +++ b/pkgs/applications/version-management/git-and-tools/github-backup/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "github-backup"; - version = "1.20141031"; - sha256 = "1rg8hz7g12k6h3vflm51l6gdi0wckmxwdq1213ykrbl8w8bvlkm8"; + version = "1.20141110"; + sha256 = "0675zcijfap757076r3j7js4iadnj1jbihmchf6ikzaanczmq1kg"; isLibrary = false; isExecutable = true; buildDepends = [ |