Commit graph

2022 commits

Author SHA1 Message Date
Vladimír Čunát 209730208a
Merge branch 'staging-next' 2018-08-17 20:51:31 +02:00
Vladimír Čunát cbabebcc2e
Merge branch 'master' into staging-next
Hydra: ?compare=1473892
2018-08-17 13:45:21 +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
Jörg Thalheim d70d575151
Merge pull request #45156 from markuskowa/lics-tools
Add license meta tags
2018-08-17 00:31:26 +02:00
Andreas Rammhold ed9f0c8f01
Merge pull request #45137 from r-ryantm/auto-update/tig
gitAndTools.tig: 2.4.0 -> 2.4.1
2018-08-16 22:34:00 +02:00
Markus Kowalewski d15421f451
cvs: add license 2018-08-16 21:44:29 +02: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
Meghea Iulian 4da408fa67 gitkraken: 3.6.6 -> 4.0.1 2018-08-16 00:01:54 +03:00
Vladimír Čunát 5b0398dc36
Merge branch 'master' into staging-next
Conflicts: gobby and libinfinity - I took the hand-edited versions
instead of those resuting from the mass-replacement.

Hydra: ?compare=1473190
2018-08-13 20:43:59 +02:00
Elis Hirwing c6bf57f58c gitea: 1.4.3 -> 1.5.0 (#44939)
Changelog: https://github.com/go-gitea/gitea/releases/tag/v1.5.0
2018-08-13 00:29:30 +02:00
Frederik Rietdijk d9fa74ba78 Merge master into staging 2018-08-09 18:28:15 +02:00
Orivej Desh 42eca7ca2d subversion: add license 2018-08-09 02:48:06 +00:00
Bjørn Forsman 970d5ef198 cgit: 1.1 -> 1.2.1
Fixes CVE-2018-14912.
2018-08-09 01:03:31 +02:00
John Ericson f0d6b385d1 treewide: Make all the rest of configureFlags 2018-08-03 17:06:03 -04:00
John Ericson 85a9913edd treewide: Make more complicated configureFlags lists 2018-08-03 17:06:03 -04:00
Cray Elliott eca1f53a52 reposurgeon: 3.28 -> 3.44
also switch from cython to pypy as cyreposurgeon was dropped upstream in
favor of using pypy
2018-08-01 20:49:53 -07:00
Cray Elliott 169d5698a9 monotone: fix build against pcre 8.42 2018-08-01 20:49:53 -07:00
Izorkin d1d4ec90ae bazaar: fix buid 2018-08-01 11:46:25 +03:00
Robert Schütz e858b285c8
Merge pull request #44239 from borisbabic/feature/init-pre-commit
gitAndTools.pre-commit: init at 1.10.4
2018-07-31 14:35:33 +02:00
Boris Babic 585b0acbc9 gitAndTools.pre-commit: init at 1.10.4 2018-07-31 14:32:27 +02:00
xeji 09393501f0
Merge pull request #43929 from r-ryantm/auto-update/mercurial-full
mercurialFull: 4.5.2 -> 4.6.2
2018-07-31 00:22:17 +02:00
Uli Baum 77b501b902 tortoisehg: 4.5.2 -> 4.6.1 2018-07-30 23:24:55 +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
Jörg Thalheim 66afbde94e
Merge pull request #44008 from dtzWill/update/tig-2.4.0
tig: 2.3.3 -> 2.4.0
2018-07-23 13:51:06 +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
Jörg Thalheim 90951bc1d7
Merge pull request #43957 from danieldk/gitea-1.4.3
gitea: 1.4.2 -> 1.4.3
2018-07-23 11:30:31 +01: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
Daniël de Kok 8b695a7353 gitea: 1.4.2 -> 1.4.3 2018-07-22 08:59:08 +02:00
Frederik Rietdijk c4557ae2c2
Merge pull request #43914 from r-ryantm/auto-update/peru
peru: 1.1.3 -> 1.1.4
2018-07-22 08:42:16 +02:00
volth cc55a3ebcb treewide: fix build with disallowed aliases (#43872)
fixes build with disallowed aliases
2018-07-21 22:03:24 -04:00
R. RyanTM 03d49258f6 mercurialFull: 4.5.2 -> 4.6.2
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/mercurial-full/versions.
2018-07-21 15:10:56 -07:00
R. RyanTM f1349908a6 peru: 1.1.3 -> 1.1.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/peru/versions.
2018-07-21 12:33:09 -07:00
Frederik Rietdijk cc218fc915
Merge pull request #43906 from r-ryantm/auto-update/subversion
subversion_1_10: 1.10.0 -> 1.10.2
2018-07-21 19:14:41 +02:00
R. RyanTM b657f663ac subversion_1_10: 1.10.0 -> 1.10.2
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/subversion/versions.
2018-07-21 09:56:00 -07:00
Jörg Thalheim 218298b30f
Merge branch 'master' into unused5 2018-07-21 15:41:22 +01:00
Frederik Rietdijk 251a0a9a86
Merge pull request #43860 from volth/unused2
treewide: remove unused 'inherit' in let blocks
2018-07-21 11:13:36 +02:00
Frederik Rietdijk d86c4fd255
Merge pull request #43835 from ryantm/mercurial
mercurial: fix homepage
2018-07-21 10:50:47 +02:00
Meghea Iulian d329579052 gitkraken: 3.6.4 -> 3.6.6 2018-07-21 09:52:33 +03: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
Ryan Mulligan 1d284727d3 mercurial: fix homepage 2018-07-19 18:45:38 -07: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