Commit graph

862 commits

Author SHA1 Message Date
Jörg Thalheim d5f3f14a45
Merge pull request #41297 from r-ryantm/auto-update/git-hub
git-hub: 1.0.0 -> 1.0.1
2018-05-31 07:44:14 +01:00
R. RyanTM b8110dbee6 git-hub: 1.0.0 -> 1.0.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-hub/versions.

These checks were done:

- built on NixOS
- /nix/store/alnsn3bczp0j8x9d8f390q67aql5y7cc-git-hub-1.0.1/bin/git-hub passed the binary check.
- 1 of 1 passed binary check by having a zero exit code.
- 1 of 1 passed binary check by having the new version present in output.
- found 1.0.1 with grep in /nix/store/alnsn3bczp0j8x9d8f390q67aql5y7cc-git-hub-1.0.1
- directory tree listing: https://gist.github.com/fc09f98152d4008f23cb52855621b6bb
- du listing: https://gist.github.com/29489408ac7b6cb1137948d9edd0fef6
2018-05-30 20:11:53 -07:00
Will Dietz 98981ec9c0
Merge pull request #41255 from dtzWill/update/hub-2.3.0
hub: 2.2.9 -> 2.3.0
2018-05-30 21:17:16 -05:00
Jörg Thalheim 4fc23d2de0 hubUnstable: remove in favor of hub 2018-05-31 00:37:46 +01:00
R. RyanTM a4e732482c gitAndTools.transcrypt: 1.0.3 -> 1.1.0 (#41231)
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

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

These checks were done:

- built on NixOS
- /nix/store/rnqjmp32pr8zq5y7bn9n0qcrnwg5qi82-transcrypt-1.1.0/bin/transcrypt passed the binary check.
- /nix/store/rnqjmp32pr8zq5y7bn9n0qcrnwg5qi82-transcrypt-1.1.0/bin/.transcrypt-wrapped passed the binary check.
- 2 of 2 passed binary check by having a zero exit code.
- 1 of 2 passed binary check by having the new version present in output.
- found 1.1.0 with grep in /nix/store/rnqjmp32pr8zq5y7bn9n0qcrnwg5qi82-transcrypt-1.1.0
- directory tree listing: https://gist.github.com/74399ed2dc0f5e79c6face443cf11691
- du listing: https://gist.github.com/6c7f5baa546117396d7b51993bf84dba
2018-05-30 23:11:42 +02:00
Will Dietz b4b65b2e67 hub: 2.2.9 -> 2.3.0
Hooray!
2018-05-30 07:54:21 -05:00
Tim Steinbach 9db1f486e1
git: 2.17.0 -> 2.17.1 2018-05-29 21:33:43 -04:00
Jörg Thalheim 173cefd4e3
Merge pull request #41213 from flokli/svn-all-fast-export-1.0.12
gitAndTools.svn-all-fast-export: 1.0.11 -> 1.0.12
2018-05-29 22:15:44 +01:00
Florian Klink 01f91267e2 gitAndTools.svn-all-fast-export: 1.0.11 -> 1.0.12
patch for https://github.com/svn-all-fast-export/svn2git/pull/40 is
contained in this release, so we can drop it here.
2018-05-29 18:42:45 +02:00
Markus Kowalewski f5ef39039c
qgit: 2.7 -> 2.8 2018-05-29 13:54:28 +02:00
Matthew Justin Bauer 98f2f08b4b
Merge pull request #41009 from matthewbauer/normalize-names
Add versions to packages missing it
2018-05-25 16:32:48 -05:00
Matthew Bauer 02297beade treewide: add version to packages
Lots of packages are missing versions in their name. This adds them
where appropriate. These were found with this command:

 $ nix-env -qa -f. | grep -v '\-[0-9A-Za-z.-_+]*$' | grep -v '^hook$'

See issue #41007.
2018-05-25 15:48:05 -05:00
Vladimír Čunát 392e6de7d0
Merge branch 'master' into staging 2018-05-20 13:20:53 +02:00
Josef Kemetmüller 3575b82e67 gitAndTools.git-dit: Fix darwin build 2018-05-20 04:09:04 +02:00
John Ericson ee4b56edd3 Merge remote-tracking branch 'upstream/master' into staging 2018-05-11 14:36:08 -04:00
Robert Schütz 45ce588000
Merge pull request #40371 from Ma27/git-cola/qt5-port
git-cola: port to qt5
2018-05-11 20:08:24 +02:00
Maximilian Bosch 1a69587040
git-cola: port to qt5
`git-cola` is a simple GUI `git` wrapper based on QT. Since 2.7
(namely 293364b45c)
it supports QT5 which provides a nicer inteface.

See #33248
2018-05-11 18:31:49 +02:00
Frederik Rietdijk a18b493e02 Merge master into staging 2018-05-09 10:48:01 +02:00
Matthew Justin Bauer 92af917827
git-secrets: fix homepage url 2018-05-08 18:17:44 -05:00
Matthew Bauer 6748534d83 Merge remote-tracking branch 'upstream/master' into staging 2018-05-08 09:36:00 -05:00
xeji dc4aa99080
Merge pull request #39770 from r-ryantm/auto-update/git-remote-gcrypt
gitAndTools.gitRemoteGcrypt: 1.0.3 -> 1.1
2018-05-05 21:24:42 +02:00
Brandon Elam Barker ee270fe647 confirmed git-secrets is now working 2018-05-04 22:02:55 +00:00
Brandon Elam Barker 77a54ea59f adding untested git-secrets 2018-05-04 18:05:08 +00:00
Will Dietz 1abe8fa47a
Merge pull request #39945 from dtzWill/fix/temp-workaround-git-test-musl
git: disable failing test w/musl for now
2018-05-03 15:48:15 -05:00
John Ericson cf06e42d1c Merge remote-tracking branch 'upstream/master' into staging 2018-05-03 16:35:36 -04:00
Will Dietz 481ca44771 git: disable failing test w/musl for now
I'm working to resolve this but it will take some time
(patches sent to upstream musl, maybe to git afterwards)
and for now this blocks quite a lot.

If that doesn't work out we can explore options such as
always using GNU libiconv with musl.
2018-05-03 15:20:38 -05: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
R. RyanTM d86866cd67 gitAndTools.gitRemoteGcrypt: 1.0.3 -> 1.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-remote-gcrypt/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/xqncvvl7rynvbw0lf27d68qj879s26bm-git-remote-gcrypt-1.1/bin/git-remote-gcrypt -h’ got 0 exit code
- ran ‘/nix/store/xqncvvl7rynvbw0lf27d68qj879s26bm-git-remote-gcrypt-1.1/bin/git-remote-gcrypt --help’ got 0 exit code
- ran ‘/nix/store/xqncvvl7rynvbw0lf27d68qj879s26bm-git-remote-gcrypt-1.1/bin/git-remote-gcrypt help’ got 0 exit code
- ran ‘/nix/store/xqncvvl7rynvbw0lf27d68qj879s26bm-git-remote-gcrypt-1.1/bin/.git-remote-gcrypt-wrapped -h’ got 0 exit code
- ran ‘/nix/store/xqncvvl7rynvbw0lf27d68qj879s26bm-git-remote-gcrypt-1.1/bin/.git-remote-gcrypt-wrapped --help’ got 0 exit code
- ran ‘/nix/store/xqncvvl7rynvbw0lf27d68qj879s26bm-git-remote-gcrypt-1.1/bin/.git-remote-gcrypt-wrapped help’ got 0 exit code
- found 1.1 with grep in /nix/store/xqncvvl7rynvbw0lf27d68qj879s26bm-git-remote-gcrypt-1.1
- directory tree listing: https://gist.github.com/f375e7b41aa0075f2c539d2c32748c12
2018-04-30 16:09:11 -07: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
gnidorah 9029ed933c nixos/gitweb: add gitwebTheme option 2018-04-17 20:07:01 +03: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
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