Vladimír Čunát
d1df28f8e5
Merge 'staging' into closure-size
...
This is mainly to get the update of bootstrap tools.
Otherwise there were mysterious segfaults:
https://github.com/NixOS/nixpkgs/pull/7701#issuecomment-203389817
2016-04-07 14:40:51 +02:00
Vladimír Čunát
ab15a62c68
Merge branch 'master' into closure-size
...
Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.
2016-04-01 10:06:01 +02:00
Bob van der Linden
318fdda01c
git-cola: 2.2.1 -> 2.5
2016-03-30 20:25:50 +02:00
zimbatm
0592eb377e
Merge pull request #14207 from zimbatm/git-and-ssh
...
git: add openssh as a runtime dependency
2016-03-30 10:23:55 +01:00
Louis Taylor
69c6f7e20a
git: 2.7.4 -> 2.8.0
2016-03-29 07:21:41 +01:00
zimbatm
6579acd015
git: add openssh as a runtime dependency
...
Fixes #1923
2016-03-26 14:39:57 +00:00
Yann Hodique
31c317e09e
git: 2.7.3 -> 2.7.4
2016-03-18 18:07:33 -07:00
Peter Simons
abcf57a8db
git: update from version 2.7.1 to 2.7.3
2016-03-16 21:35:55 +01:00
Vladimír Čunát
09af15654f
Merge master into closure-size
...
The kde-5 stuff still didn't merge well.
I hand-fixed what I saw, but there may be more problems.
2016-03-08 09:58:19 +01:00
zimbatm
75d7692ab3
gitAndTools.darcsToGit: 0.2git -> 2015-06-04
...
Fixes error where ruby 2.0+ doesn't have iconv anymore.
`require': cannot load such file -- iconv (LoadError)
2016-03-05 18:45:39 +00:00
Nathan Zadoks
819dab0203
git-remote-hg: fix the derivation name
...
-v0.2 isn't parsed as a version by Nix, and makes it inconvenient to
install git-remote-hg through nix-env.
2016-03-03 14:51:31 +01:00
Graham Christensen
73f6410851
cgit: 0.11.2 -> 0.12 for CVE-2016-1899 CVE-2016-1900 CVE-2016-1901
2016-02-27 15:35:19 -06:00
zimbatm
17348dc094
Remove all dots at end of descriptions
...
Specially crafted for @JagaJaga
find pkgs -name "*.nix" -exec \
sed -e 's|\(description.*\)\.";|\1";|g' -i {} \;
2016-02-27 17:30:29 +00:00
Franz Pletz
af17efd014
Merge pull request #13466 from benley/git-stree-0.4.5
...
git-stree: init at 0.4.5
2016-02-26 09:59:47 +01:00
zimbatm
428e12d23f
Merge pull request #13154 from zimbatm/git-rebase-fix-v2
...
git: fixes references to gettext properly
2016-02-26 00:03:17 +00:00
Benjamin Staffin
fe6ad9e912
git-stree: init at 0.4.5
2016-02-25 15:26:06 -08:00
Benjamin Staffin
ca5f243697
git-and-tools: alphabetize attributes before it gets too huge
2016-02-25 14:23:34 -08:00
Wout Mertens
677893f92b
Merge pull request #13422 from k0ral/git
...
git: 2.7.0 -> 2.7.1
2016-02-24 15:09:28 +01:00
koral
c1504c5a94
git: 2.7.0 -> 2.7.1
2016-02-24 13:47:23 +01:00
zimbatm
11733b39b5
git: fixes references to gettext properly
...
A better implementation of 5273dbf530
Fixes https://github.com/NixOS/nixpkgs/issues/13150
The attached patch removes a whole swath of unnecessary runtime gettext
detection. It also adds gettext on the PATH so that git-rebase can find it.
2016-02-20 14:47:23 +00:00
Frederik Rietdijk
4d06bf70f4
buildPythonApplication: use new function for Python applications
2016-02-19 13:16:41 +01:00
Vladimír Čunát
e9520e81b3
Merge branch 'master' into staging
2016-02-17 10:06:31 +01:00
zimbatm
c38eb526d5
git: fix references to gettext in bash scripts
...
See #13047
2016-02-16 21:01:21 +00:00
Vladimír Čunát
54299b60c4
Merge #12779 : Mass replace pkg}/bin
-style strings
...
... to refer to correct outputs
2016-02-03 17:25:22 +01:00
Vladimír Čunát
ae74c356d9
Merge recent 'staging' into closure-size
...
Let's get rid of those merge conflicts.
2016-02-03 16:57:19 +01:00
Guillaume Maudoux
9f358f809d
Configure a default trust store for openssl
2016-02-03 12:42:01 +01:00
Tuomas Tynkkynen
e97e690244
treewide: Mass replace 'xz}/bin' to refer the 'bin' output
2016-02-01 20:46:28 +02:00
Tuomas Tynkkynen
5f4a8de754
treewide: Mass replace 'bzip2}/bin' to refer the 'bin' output
2016-02-01 20:45:57 +02:00
Jascha Geerds
f7578a4d32
gitflow: 1.8.0 -> 1.9.1
2016-01-27 17:15:42 +01:00
Christoph Hrdinka
890f000146
goPackages.git-annex-remote-b2: init at 0.2
2016-01-26 17:54:53 +01:00
Tobias Geerinckx-Rice
9fb8020e4e
Add version attribute where maintainers |= nckx
...
This will probably be mandatory soon, and is a step in the right
direction. Removes the deprecated meta.version, and move some meta
sections to the end of the file where I should have put them in
the first place.
2016-01-25 17:35:21 +01:00
Vladimír Čunát
716aac2519
Merge branch 'staging' into closure-size
2016-01-19 09:55:31 +01:00
Vladimír Čunát
2d0893088f
Merge branch 'master' into staging
2016-01-15 13:43:57 +01:00
Vladimír Čunát
c169718a6b
git-bz: fix meta typo
...
Thanks to @heydojo.
2016-01-15 10:26:18 +01:00
Tobias Geerinckx-Rice
d1440745c6
git-bz: meta: un-break; fix licence; maintain
...
CC @nbp (I assume it was abandoned years ago, apologies otherwise).
2016-01-15 05:31:47 +01:00
Tobias Geerinckx-Rice
36a68c8b6b
git-bz: 3.20110902 -> 3.2015-09-08
2016-01-15 05:31:47 +01:00
Tobias Geerinckx-Rice
123065aa3d
git-bz: use callPackage and canonical package name
...
Don't add a compatibility alias as this package was/is marked as
being broken anyway.
2016-01-15 05:31:47 +01:00
somaticweb
2c4c9bee13
git: 2.6.4 -> 2.7.0
...
Also corrected the license, which is GPL2-only
2016-01-05 22:15:17 -08:00
janus
a472d836f6
FreeBSD: apr-util, cyrus-sasl, berkeley db, glib, gnutls, kerberos, libelf-freebsd, openldap, serf, guile, tet, shishi, gawk, gnugrep
2016-01-01 17:01:13 +00:00
Vladimír Čunát
f9f6f41bff
Merge branch 'master' into closure-size
...
TODO: there was more significant refactoring of qtbase and plasma 5.5
on master, and I'm deferring pointing to correct outputs to later.
2015-12-31 09:53:02 +01:00
Matt McHenry
090efc2907
subgit: init at 3.1.0
2015-12-28 22:59:23 -05:00
Eric Merritt
6108bb8971
hub: 2.2.1 -> 2.2.2
2015-12-23 08:37:02 -08:00
Peter Simons
e5b15f6b52
Merge pull request #11838 from k0ral/git
...
git: 2.6.3 -> 2.6.4
2015-12-20 11:55:57 +01:00
koral
016e88b2d2
git: 2.6.3 -> 2.6.4
2015-12-19 17:37:37 +00:00
Igor Pashev
85375fc5fc
git-crypt needs GnuPG
2015-12-17 11:00:50 +03:00
Luca Bruno
5b0352a6a4
Merge branch 'master' into closure-size
2015-12-11 18:31:00 +01:00
Vladimír Čunát
263fd55d4b
Merge recent staging built on Hydra
...
http://hydra.nixos.org/eval/1231884
Only Darwin jobs seem to be queued now,
but we can't afford to wait for that single build slave.
2015-12-05 11:11:51 +01:00
Luca Bruno
920b1d3591
Merge branch 'master' into closure-size
2015-11-29 16:50:26 +01:00
Tobias Geerinckx-Rice
2798b02ad0
Convert some *Flags from strings to lists
2015-11-26 23:45:31 +01:00
Jude Taylor
69e7f3bb74
switch to zero underscores for sandbox profiles; remove generateFrameworkProfile
2015-11-21 12:10:33 -08:00