Commit graph

1897 commits

Author SHA1 Message Date
John Ericson cf06e42d1c Merge remote-tracking branch 'upstream/master' into staging 2018-05-03 16:35:36 -04:00
Matthew Bauer 143978a477 treewide: remove platform assertions
linux: readd assertion
2018-05-03 13:09:20 -05:00
Matthew Justin Bauer eeb016e8f0
Merge branch 'staging' into fix-ncurses-darwin-extensions 2018-05-02 15:40:38 -05:00
R. RyanTM 0d2397380f git-cola: 3.0 -> 3.1
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/git-cola/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/vdgbmam99abv4kryg2bn31vkzdxk90cq-git-cola-3.1/bin/.git-cola-wrapped -h’ got 0 exit code
- ran ‘/nix/store/vdgbmam99abv4kryg2bn31vkzdxk90cq-git-cola-3.1/bin/.git-cola-wrapped --help’ got 0 exit code
- ran ‘/nix/store/vdgbmam99abv4kryg2bn31vkzdxk90cq-git-cola-3.1/bin/.git-cola-wrapped --version’ and found version 3.1
- ran ‘/nix/store/vdgbmam99abv4kryg2bn31vkzdxk90cq-git-cola-3.1/bin/.git-cola-wrapped version’ and found version 3.1
- ran ‘/nix/store/vdgbmam99abv4kryg2bn31vkzdxk90cq-git-cola-3.1/bin/git-cola -h’ got 0 exit code
- ran ‘/nix/store/vdgbmam99abv4kryg2bn31vkzdxk90cq-git-cola-3.1/bin/git-cola --help’ got 0 exit code
- ran ‘/nix/store/vdgbmam99abv4kryg2bn31vkzdxk90cq-git-cola-3.1/bin/git-cola --version’ and found version 3.1
- ran ‘/nix/store/vdgbmam99abv4kryg2bn31vkzdxk90cq-git-cola-3.1/bin/git-cola version’ and found version 3.1
- ran ‘/nix/store/vdgbmam99abv4kryg2bn31vkzdxk90cq-git-cola-3.1/bin/.git-dag-wrapped -h’ got 0 exit code
- ran ‘/nix/store/vdgbmam99abv4kryg2bn31vkzdxk90cq-git-cola-3.1/bin/.git-dag-wrapped --help’ got 0 exit code
- ran ‘/nix/store/vdgbmam99abv4kryg2bn31vkzdxk90cq-git-cola-3.1/bin/.git-dag-wrapped --version’ and found version 3.1
- ran ‘/nix/store/vdgbmam99abv4kryg2bn31vkzdxk90cq-git-cola-3.1/bin/git-dag -h’ got 0 exit code
- ran ‘/nix/store/vdgbmam99abv4kryg2bn31vkzdxk90cq-git-cola-3.1/bin/git-dag --help’ got 0 exit code
- ran ‘/nix/store/vdgbmam99abv4kryg2bn31vkzdxk90cq-git-cola-3.1/bin/git-dag --version’ and found version 3.1
- found 3.1 with grep in /nix/store/vdgbmam99abv4kryg2bn31vkzdxk90cq-git-cola-3.1
- directory tree listing: https://gist.github.com/af016e8541c2ac80ef4e4e16a00bc0de
2018-05-01 15:42:37 +02:00
Will Dietz 6e623fb07b
Merge pull request #39461 from dtzWill/update/git-2.17.0-again
git: 2.16.3 -> 2.17.0, again, installCheck
2018-04-26 08:49:04 -05:00
Robin Gloster 04ab1ed623
gitlab: 10.5.6 -> 10.7.0 2018-04-26 00:15:24 +02:00
Robin Gloster 775bbc2d57
gitlab-workhorse: 3.6.0 -> 4.1.0 2018-04-26 00:15:24 +02:00
Robin Gloster ddec4ae7a0
gitlab-shell: 6.0.3 -> 7.1.2 2018-04-26 00:15:24 +02:00
Robin Gloster 59ad9933ff
gitaly: 0.81.0 -> 0.95.0 2018-04-26 00:15:23 +02:00
Jan Malakhovski 7438083a4d tree-wide: disable doCheck and doInstallCheck where it fails (the trivial part) 2018-04-25 04:18:46 +00:00
Guillaume Maudoux 6dda53ad22 git: add install checks
(cherry picked from commit f57873f674ebc2f6ae874407aafb98a1350ab525)
2018-04-24 20:26:54 -05:00
Will Dietz 97372a1104 git: 2.16.3 -> 2.17.0... again! 2018-04-24 20:19:22 -05:00
Will Dietz f07f0c6009 Merge remote-tracking branch 'origin/master' into staging 2018-04-24 19:58:44 -05:00
Ben Gamari b26ae506a9 git: Set PERL_PATH when building manual
Otherwise the build fails with the perplexing error

    make: *** No rule to make target 'cmd-list.made', needed by 'doc.dep'.  Stop.
    make: Leaving directory '/tmp/nix-build-git-2.16.3.drv-0/git-2.16.3/Documentation'

on NixOS (but not on Debian, where it succeeds, presumably since it picks up the
system perl).
2018-04-24 19:00:34 -04:00
Ben Gamari d111a42772 git: Enable cross-compilation 2018-04-24 14:58:58 -04:00
Ben Gamari 2d397f1b76 git: Allow perl support to be disabled 2018-04-24 14:58:58 -04:00
Ben Gamari 432df5b1cf git: Fix USE_LIBPCRE2 configuration
Previously this was injected during install, causing the build system to rebuild
the entire package.
2018-04-24 14:58:58 -04:00
Ben Gamari ae0a14d25d git: Refactor makeFlags using lib.optionals 2018-04-24 14:58:58 -04:00
Tuomas Tynkkynen 3c6e077301 Merge remote-tracking branch 'upstream/master' into HEAD
Conflicts:
	pkgs/development/tools/misc/binutils/default.nix
2018-04-22 22:31:30 +03:00
Wout Mertens 77a1993b46
Merge pull request #38918 from gnidorah/gitweb
nixos/gitweb: add gitwebTheme option
2018-04-20 21:32:34 +02:00
adisbladis 19bc90f911
bazaar: Fix CVE-2017-14176 2018-04-20 02:07:37 +08:00
gnidorah 9029ed933c nixos/gitweb: add gitwebTheme option 2018-04-17 20:07:01 +03:00
Matthew Justin Bauer 186ec06af9
Merge pull request #38650 from sondr3/gitea-1.4.0
gitea: 1.3.3 -> 1.4.0
2018-04-17 10:04:52 -05:00
Tuomas Tynkkynen 16b45ec3da Merge remote-tracking branch 'upstream/master' into HEAD
Conflicts:
	pkgs/applications/version-management/git-and-tools/git/default.nix
	pkgs/top-level/all-packages.nix
	pkgs/top-level/unix-tools.nix
2018-04-16 21:13:30 +03:00
Yurii Rashkovskii 1fa183defe
sit: 0.2.1 -> 0.3.0 2018-04-13 07:57:21 -07:00
Peter Simons d503d493ab vcsh: update to latest version and add missing Perl test suite dependencies to fix the build 2018-04-13 09:59:17 +02:00
Matthew Bauer e49f601b7f cvs: apply darwin patch
Fixes #36532
2018-04-12 18:17:23 -05:00
Will Dietz 281775bb1a git: 2.16.2 -> 2.16.3
Cherry picked from 260194193c in staging as suggested by
https://github.com/NixOS/nixpkgs/pull/38763#issuecomment-380504142.
2018-04-12 08:55:31 +02:00
Guillaume Maudoux 2ddba49f59 git: fix perl libs path 2018-04-11 17:54:08 +02:00
Guillaume Maudoux ad076ff7ce git: 2.16.3 -> 2.17.0 2018-04-11 17:54:08 +02:00
Will Dietz 260194193c git: 2.16.2 -> 2.16.3 2018-04-11 17:54:08 +02:00
Frederik Rietdijk ee6894ca12 Merge staging into master 2018-04-11 14:55:52 +02:00
Peter Simons e4fd05449e git: revert "2.16.2 -> 2.17.0"
This reverts commit 5d65b4ebeb, because it broke
git-add. See https://github.com/NixOS/nixpkgs/pull/38636#issuecomment-380182555
for details.
2018-04-11 09:51:06 +02:00
Frederik Rietdijk 6023849ba1 Merge master into staging 2018-04-10 19:23:42 +02:00
Jörg Thalheim be81bed434
Merge pull request #35044 from layus/update-hub
gitAndTools.hubUnstable: init at 2.3.0-pre10
2018-04-10 17:36:33 +01:00
Guillaume Maudoux d92d1db717 gitAndTools.hubUnstable: init at 2.3.0-pre10 2018-04-10 17:11:26 +02:00
Robert Schütz 80fc5f2a24 Merge branch 'master' into staging 2018-04-10 09:13:36 +02:00
Matthew Justin Bauer a7341d70ef
Merge pull request #36884 from nioncode/p4v
p4v: init at 2017.3.1601999
2018-04-09 14:07:03 -05:00
Sondre Nilsen a73cdc7333
gitea: 1.3.3 -> 1.4.0 2018-04-09 16:58:06 +02:00
Frederik Rietdijk 0aa59a08d6 Merge master into staging 2018-04-09 15:12:32 +02:00
Peter Simons 1cdcc19218
Merge pull request #38636 from layus/git-2.17.0
git: 2.16.2 -> 2.17.0
2018-04-09 14:02:18 +02:00
Guillaume Maudoux 5d65b4ebeb git: 2.16.2 -> 2.17.0 2018-04-09 10:02:57 +02:00
Matthew Justin Bauer ac04a2e2f6
Merge pull request #38050 from ryantm/auto-update/stgit
gitAndTools.stgit: 0.17.1 -> 0.18
2018-04-08 21:53:27 -05:00
Jörg Thalheim 2c364726c1
Merge pull request #38370 from jluttine/fix-nbstripout-0.3.1
nbstripout: fix tests
2018-04-08 14:19:02 +01:00
Frederik Rietdijk 595a72589f Merge master into staging 2018-04-08 10:54:17 +02:00
Yurii Rashkovskii 7a77ba4a5f
sit: 0.1.3 -> 0.2.1 2018-04-08 10:50:58 +02:00
Matthias Beyer ce1c1e3093 Remove maintainership
With this patch I remove myself as a maintainer for all packages I
currently maintain.

This is due the fact that I will be basically off the grid from May 2018
until early 2019, as I will be on a trip through north america.

I will revert this patch as soon as I'm back, as I plan to continue
contributing to nixpkgs then.
But as I cannot maintain anything during that time, I'd like to get this
patch merged.

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
2018-04-06 10:57:19 +02:00
Jaakko Luttinen caf8794910
nbstripout: fix tests
Building of nbstripout has failed after the version was bumped to 0.3.1 because:
the test files were missing from the new release tarball. This adds tests by
using the release tarball from GitHub instead of PyPI.

However, these tests fail because of a bug in one test. Thus, a patch is used to
fix the tests.
2018-04-05 10:02:34 +03:00
Frederik Rietdijk 23741692fa Merge master into staging 2018-04-04 19:36:39 +02:00
Tim Steinbach 2bb28e1f01
Revert "git: 2.16.3 -> 2.17.0"
This reverts commit 3bd496faa8.
2018-04-04 08:35:19 -04:00