Commit graph

913 commits

Author SHA1 Message Date
vanzef 82f2ae0260 gitAndTools.pass-git-helper: init at 0.4 (#47056) 2018-09-26 13:46:05 +01:00
Jörg Thalheim e1ef438026
Merge pull request #47234 from Ma27/fix-tig-zsh-completion
tig: fix zsh completion
2018-09-23 19:17:40 +01:00
Maximilian Bosch 4bf1a7d975
tig: fix zsh completion
The ZSH completion script of `tig` basically imports the bash completion
script and uses it as completion approach. Unfortunately the script
takes several assumptions about the directory structure using
`$funcsourcetrace`[1] that don't apply on NixOS.

The easiest workaround is t opatch the completion script and import the
bash completion script from `$out`.

[1] http://zsh.sourceforge.net/Doc/Release/Zsh-Modules.html#index-funcsourcetrace
2018-09-23 19:36:22 +02:00
Boris f799dff21b gitAndTools.pre-commit: 1.11.0 -> 1.11.1 (#47211) 2018-09-23 14:01:56 +02:00
Jörg Thalheim 57da7993e3
Merge pull request #46824 from borisbabic/update/gitAndTools.pre-commit-1.11.0
gitAndTools.pre-commit: 1.10.4 -> 1.11.0
2018-09-18 13:15:52 +01:00
Boris Babic 9f25c99cb1 gitAndTools.pre-commit: 1.10.4 -> 1.11.0 2018-09-18 13:06:50 +02:00
Vincent Demeester 69f028ea01
git-appraise: init unstable at 2018-02-26
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2018-09-18 09:48:33 +02:00
Maximilian Bode 6b7cefdc58 gitAndTools.grv: fix darwin build by using go 1.9
cf. https://github.com/fsnotify/fsevents/issues/40

/cc ZHF #45961
2018-09-14 19:41:03 +02:00
R. RyanTM 7f40c3a93c gitAndTools.git-imerge: 1.0.0 -> 1.1.0 (#46281)
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-imerge/versions
2018-09-12 23:10:04 +02:00
R. RyanTM 6d8a48e585 gitAndTools.svn-all-fast-export: 1.0.12 -> 1.0.13 (#46173)
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
svn-all-fast-export
2018-09-11 00:07:37 +02:00
Daniël de Kok bbcf5eb130 cgit: use full path of groff in man2html
groff may not be installed system-wide or may be outside cgit's path
(e.g. when running cgit using uwsgi). As a result, the man2html filter
fails. Replace groff by its full path in man2html.
2018-09-09 14:37:30 +02:00
R. RyanTM 58cbb0d0e6 git-cola: 3.1 -> 3.2
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
git-cola
2018-08-30 18:28:14 -07:00
Will Dietz 5903cc1b2d hub: 2.5.0 -> 2.5.1 (#45599) 2018-08-24 23:00:00 +02:00
Jörg Thalheim 2c612a9037
Merge pull request #45229 from r-ryantm/auto-update/git-extras
gitAndTools.git-extras: 4.5.0 -> 4.6.0
2018-08-17 11:33:49 +01:00
R. RyanTM f3be269e35 gitAndTools.git-extras: 4.5.0 -> 4.6.0
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-extras/versions.
2018-08-17 02:46:46 -07:00
R. RyanTM a9d29f4716 gitAndTools.tig: 2.4.0 -> 2.4.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/tig/versions.
2018-08-16 12:10:40 -07:00
Bjørn Forsman 970d5ef198 cgit: 1.1 -> 1.2.1
Fixes CVE-2018-14912.
2018-08-09 01:03:31 +02:00
Boris Babic 585b0acbc9 gitAndTools.pre-commit: init at 1.10.4 2018-07-31 14:32:27 +02:00
Will Dietz c9d79c639f grv: 0.1.2 -> 0.2.0
Needs libgit2 0.27 apparently,
doesn't build with 0.26 or 0.25 in-tree.
2018-07-26 15:35:32 -05:00
Frederik Rietdijk 099c13da1b Merge staging-next into master (#44009)
* substitute(): --subst-var was silently coercing to "" if the variable does not exist.

* libffi: simplify using `checkInputs`

* pythonPackges.hypothesis, pythonPackages.pytest: simpify dependency cycle fix

* utillinux: 2.32 -> 2.32.1

https://lkml.org/lkml/2018/7/16/532

* busybox: 1.29.0 -> 1.29.1

* bind: 9.12.1-P2 -> 9.12.2

https://ftp.isc.org/isc/bind9/9.12.2/RELEASE-NOTES-bind-9.12.2.html

* curl: 7.60.0 -> 7.61.0

* gvfs: make tests run, but disable

* ilmbase: disable tests on i686. Spooky!

* mdds: fix tests

* git: disable checks as tests are run in installcheck

* ruby: disable tests

* libcommuni: disable checks as tests are run in installcheck

* librdf: make tests run, but disable

* neon, neon_0_29: make tests run, but disable

* pciutils: 3.6.0 -> 3.6.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/pciutils/versions.

* mesa: more include fixes

mostly from void-linux (thanks!)

* npth: 1.5 -> 1.6

minor bump

* boost167: Add lockfree next_prior patch

* stdenv: cleanup darwin bootstrapping

Also gets rid of the full python and some of it's dependencies in the
stdenv build closure.

* Revert "pciutils: use standardized equivalent for canonicalize_file_name"

This reverts commit f8db20fb3a.
Patching should no longer be needed with 3.6.1.

* binutils-wrapper: Try to avoid adding unnecessary -L flags

(cherry picked from commit f3758258b8895508475caf83e92bfb236a27ceb9)
Signed-off-by: Domen Kožar <domen@dev.si>

* libffi: don't check on darwin

libffi usages in stdenv broken darwin. We need to disable doCheck for that case.

* "rm $out/share/icons/hicolor/icon-theme.cache" -> hicolor-icon-theme setup-hook

* python.pkgs.pytest: setupHook to prevent creation of .pytest-cache folder, fixes #40273

When `py.test` was run with a folder as argument, it would not only
search for tests in that folder, but also create a .pytest-cache folder.
Not only is this state we don't want, but it was also causing
collisions.

* parity-ui: fix after merge

* python.pkgs.pytest-flake8: disable test, fix build

* Revert "meson: 0.46.1 -> 0.47.0"

With meson 0.47.0 (or 0.47.1, or git)
things are very wrong re:rpath handling
resulting in at best missing libs but
even corrupt binaries :(.

When we run patchelf it masks the problem
by removing obviously busted paths.
Which is probably why this wasn't noticed immediately.

Unfortunately the binary already
has a long series of paths scribbled
in a space intended for a much smaller string;
in my testing it was something like
lengths were 67 with 300+ written to it.

I think we've reported the relevant issues upstream,
but unfortunately it appears our patches
are what introduces the overwrite/corruption
(by no longer being correct in what they assume)

This doesn't look so bad to fix but it's
not something I can spend more time on
at the moment.

--

Interestingly the overwritten string data
(because it is scribbled past the bounds)
remains in the binary and is why we're suddenly
seeing unexpected references in various builds
-- notably this is is the reason we're
seeing the "extra-utils" breakage
that entirely crippled NixOS on master
(and probably on staging before?).

Fixes #43650.

This reverts commit 305ac4dade.

(cherry picked from commit 273d68eff8f7b6cd4ebed3718e5078a0f43cb55d)
Signed-off-by: Domen Kožar <domen@dev.si>
2018-07-24 15:04:48 +01:00
Will Dietz 90764df235 tig: 2.3.3 -> 2.4.0
https://github.com/jonas/tig/releases/tag/tig-2.4.0
2018-07-23 07:15:26 -05:00
Benjamin Staffin 815ae70556
gitFull: build libsecret credential helper (#43616)
...except on Darwin, where it won't be useful.
2018-07-22 15:20:37 -04:00
volth cc55a3ebcb treewide: fix build with disallowed aliases (#43872)
fixes build with disallowed aliases
2018-07-21 22:03:24 -04:00
Jörg Thalheim 218298b30f
Merge branch 'master' into unused5 2018-07-21 15:41:22 +01:00
volth 52f53c69ce pkgs/*: remove unreferenced function arguments 2018-07-21 02:48:04 +00:00
volth 6d2857a311 [bot] treewide: remove unused 'inherit' in let blocks 2018-07-20 19:38:19 +00:00
Matthew Bauer 76999cc40e treewide: remove aliases in nixpkgs
This makes the command ‘nix-env -qa -f. --arg config '{skipAliases =
true;}'’ work in Nixpkgs.

Misc...

- qtikz: use libsForQt5.callPackage

  This ensures we get the right poppler.

- rewrites:

  docbook5_xsl -> docbook_xsl_ns
  docbook_xml_xslt -> docbook_xsl

diffpdf: fixup
2018-07-18 23:25:20 -04:00
volth 101df126bb config.skipAliases -> config.allowAliases 2018-07-17 14:46:21 +00:00
volth 4bafaaff8a config.skipAliases: also disable vimPlugins, git, xfce and gnome3 aliases 2018-07-17 14:46:21 +00:00
lewo 8155016932
Merge pull request #43617 from dtzWill/update/hub-2.5.0
hub: 2.4.0 -> 2.5.0
2018-07-17 15:39:49 +02:00
Will Dietz 553fd39e53 hub: 2.4.0 -> 2.5.0 2018-07-16 10:55:13 -05:00
Vladimír Čunát 0f01215203
Merge branch 'master' into staging-next
Hydra: ?compare=1468896
2018-07-14 18:15:30 +02:00
Jörg Thalheim bc05053631 tig: zsh completion should be named _tig 2018-07-12 07:26:56 -04:00
Matthieu Coudron a66a44186f tig: add zsh completion
along with contrib/vim.tigrc config in case users want to use it.
2018-07-12 12:39:11 +09:00
Vladimír Čunát f7781f5293
Merge branch 'master' into staging 2018-06-30 01:41:59 +02:00
Silvan Mosberger 57bccb3cb8 treewide: http -> https sources (#42676)
* treewide: http -> https sources

This updates the source urls of all top-level packages from http to
https where possible.

* buildtorrent: fix url and tab -> spaces
2018-06-28 20:43:35 +02:00
Will Dietz bb00076931 Revert "Revert "Merge pull request #42376 from dtzWill/update/git-2.18.0""
This reverts commit 6d1955e0c4.
2018-06-28 07:01:14 -05:00
xeji b8ad7ec94b
Merge pull request #41876 from IvanMalison/addGitSync
Add git sync
2018-06-26 13:06:49 +02:00
Uli Baum 19ce96584a git-sync: move to gitAndTools.git-sync
By convention, git-related tools in nixpkgs are not added to
the top level but bundled under gitAndTools.
2018-06-26 12:33:18 +02:00
Will Dietz 6d1955e0c4 Revert "Merge pull request #42376 from dtzWill/update/git-2.18.0"
This reverts commit 2624f90796, reversing
changes made to 37aab4cbb5.

See:
https://github.com/NixOS/nixpkgs/pull/42376#issuecomment-399789096

Basically this breaks at least some users of fetchgit,
so let's revert this until this is sorted out.
2018-06-24 22:36:50 -05:00
Will Dietz 26f24fe09a git: indicate when last tested to "still" fail, for checking updates 2018-06-22 10:10:20 -05:00
Will Dietz 1190af39b9 git: disable failing completion test as well 2018-06-22 10:02:57 -05:00
Will Dietz 4136cb5ba9 git: disable "editor with a space" tests due to fails
Need to investigate.
2018-06-22 10:00:42 -05:00
Will Dietz e65e6cad23 git: disable working-tree-encoding tests on musl
Makes assumptions about BOM.
2018-06-22 09:56:20 -05:00
Will Dietz 5f27396e8f git: remove symlinks-in-bin patch 2018-06-22 09:15:54 -05:00
Will Dietz 18231121f4 git: 2.17.1 -> 2.18.0 2018-06-22 09:12:06 -05:00
Matthew Bauer fc048073e6 git: remove object file from closure
This file pulls in some big dependencies that are unneeded (like
clang).
2018-06-21 19:47:10 -04:00
Jörg Thalheim 6906e5c149 gitAndTools.hub: remove go compiler from runtime closure 2018-06-21 23:34:44 +01:00
R. RyanTM 802ea37863 git-secret: 0.2.3 -> 0.2.4
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-secret/versions.

These checks were done:

- built on NixOS
- /nix/store/rhxzf1mc0jz2m3rp0rg5wqn81ykfshay-git-secret-0.2.4/bin/git-secret passed the binary check.
- /nix/store/rhxzf1mc0jz2m3rp0rg5wqn81ykfshay-git-secret-0.2.4/bin/.git-secret-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 0.2.4 with grep in /nix/store/rhxzf1mc0jz2m3rp0rg5wqn81ykfshay-git-secret-0.2.4
- directory tree listing: https://gist.github.com/d460daac78bbcef226d1fff7918d150d
- du listing: https://gist.github.com/ea683543c922a9c179a97faf441a1797
2018-06-19 11:59:41 -07:00
Ivan Malison 53138130f8
git-sync: init at 20151024 2018-06-12 10:33:25 -07:00