80bff0b459
git: link git-credential-netrc into $out/bin
2016-11-19 13:36:30 -08:00
ef4a335be4
git: 2.10.1 -> 2.10.2
2016-11-15 18:05:02 -05:00
6de23f466b
gitAndTools.gitflow: 1.10.0 -> 1.10.2
2016-10-29 15:59:07 +02:00
e56832d730
Merge remote-tracking branch 'upstream/master' into HEAD
2016-10-22 17:23:24 +02:00
4d5b893002
Merge #19081 : gnome-3.22
...
Also master commits are brought in.
2016-10-20 23:04:10 +02:00
c431f11d1f
gitAndTools.git-hub: use python2
...
imports urllib2
2016-10-18 23:16:04 +02:00
9b68f4272c
git-cola: 2.5 -> 2.8
2016-10-17 22:11:33 +02:00
13293d108d
Merge pull request #19459 from dipinhora/git-osxkeychain
...
git: enable credential-osxkeychain for darwin
2016-10-16 12:03:31 +01:00
811b876fab
Revert "openssl, curl, git: Respect $NIX_SSL_CERT_FILE"
...
This reverts commit 942dbf89c6
2016-10-14 16:01:54 +02:00
061758490f
Merge branch 'master' into staging
...
... to get the openssl mass rebuild: 942dbf89c
2016-10-14 13:16:11 +02:00
942dbf89c6
openssl, curl, git: Respect $NIX_SSL_CERT_FILE
...
$NIX_SSL_CERT_FILE overrides $SSL_CERT_FILE, which in turn overrides
the default CA path (/etc/ssl/certs/ca-certificates.crt). This allows
Nix to set a CA path without interfering with other packages (such as
Homebrew).
See https://github.com/NixOS/nix/issues/921 .
2016-10-14 12:06:10 +02:00
6eeea6effd
Python: more evaluation fixups.
2016-10-14 00:03:12 +02:00
19c42ee0b7
gitAndTools.gitflow: 1.9.1 -> 1.10.0
2016-10-11 23:38:29 +02:00
641a1e433a
git: enable credential-osxkeychain for darwin
2016-10-11 15:25:08 -04:00
9d85dd7ec0
git-extras: 4.1.0 -> 4.2.0
2016-10-09 12:37:22 +02:00
2fb5289d83
git: 2.10.0 -> 2.10.1
2016-10-05 10:37:09 +02:00
c2f6752e01
git-crypt: remove platforms
...
fixes #18811
2016-10-01 00:48:12 +02:00
4d15b2cdb0
hub: 2.2.5 -> 2.2.8
2016-09-22 09:26:58 +02:00
914e0e594c
buildGoPackage: deps.json -> deps.nix in NIXON
...
https://github.com/NixOS/nixpkgs/pull/17254#issuecomment-245295541
* update docs to describe `deps.nix`
* include goDeps in nix-shell GOPATH
* NixOS 16.09 rel notes about replacing goPackages
2016-09-16 00:04:55 +01:00
f649d4eefa
git-annex: fix GHC 8.x build
2016-09-09 13:55:39 +02:00
598ccfdec9
transcrypt: 0.9.7 -> 0.9.9
2016-09-06 14:55:19 -07:00
2b86ccbf32
git: 2.9.3 -> 2.10.0
2016-09-03 16:20:32 +05:30
b6f9f3de46
Merge pull request #18236 from mimadrid/update/hub-2.2.5
...
hub: 2.2.3 -> 2.2.5
2016-09-03 07:35:55 +02:00
307a4650c8
hub: 2.2.3 -> 2.2.5
2016-09-03 00:38:38 +02:00
24a9183f90
Merge branch 'hardened-stdenv' into staging
...
Closes #12895
Amazing work by @globin & @fpletz getting hardened compiler flags by
enabled default on the whole package set
2016-08-22 01:19:35 +01:00
bdc38c6a67
Merge pull request #17829 from mimadrid/update/git-2.9.3
...
git: 2.9.2 -> 2.9.3
2016-08-19 10:16:46 +02:00
7f3a4688f0
git: 2.9.2 -> 2.9.3
2016-08-18 21:13:00 +02:00
dc7c848e10
tig: 2.1.1 -> 2.2
...
Signed-off-by: Silvio Fricke <silvio.fricke@gmail.com>
2016-08-18 16:24:25 +02:00
bd4490e277
Merge branch 'master' into hardened-stdenv
2016-08-13 16:59:55 +02:00
c2302f2f45
Merge pull request #17677 from kamilchm/no-go-libs-json
...
buildGoPackage: remove Go deps file `libs.json`
2016-08-12 18:13:29 +01:00
bd20aaa767
diff-so-fancy: 0.10.1 -> 0.11.1 ( #17691 )
2016-08-12 15:12:29 +02:00
da3ddd48e4
buildGoPackage: remove Go deps file `libs.json`
...
After #16017 there were a lot
of comments saying that `nix` would be better than `JSON`
for Go packages dependency sets.
As said in https://github.com/NixOS/nixpkgs/pull/16017#issuecomment-229624046
> Because of the content-addressable store, if two programs have the
> same dependency it will already result in the same derivation in
> the
> store. Git also has compression in the pack files so it won't make
> much difference to duplicate the dependencies on disk. And finally
> most users will just use the binary builds so it won't make any
> differences to them.
This PR removes `libs.json` file and puts all package dependencies in
theirs `deps.json`.
2016-08-11 23:07:09 +02:00
1b979d8384
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-08-03 13:34:44 +00:00
21f17d69f6
treewide: Add lots of meta.platforms
...
Build-tested on x86_64 Linux & Mac.
2016-08-02 21:42:43 +03:00
63c7b4f9a7
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-07-31 20:51:34 +00:00
59caf069a4
git: 2.9.1 -> 2.9.2
2016-07-29 11:28:31 +02:00
e7ef33c50a
git: fix gitweb.cgi breakage due to missing CGI.pm
...
CGI.pm was removed from Perl core in v5.22, breaking the gitweb.cgi
script and thus NixOS' services.lighttpd.gitweb. Nixpkgs switched to
Perl 5.22 with a85ba820a4
2016-07-26 15:20:24 +02:00
f222d98746
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-07-25 12:47:13 +00:00
641fc0e683
haskell: remove all but the latest LTS package sets (version 6.7)
...
This is the first step towards dropping Stackage support. We keep LTS 6.x
around because I don't want to downgrade our default compiler to GHC 7.x,
but once LTS 7.x comes out we'll switch our main package set to that and
drop Nightly.
More details are at:
http://permalink.gmane.org/gmane.linux.distributions.nixos/20505
Closes https://github.com/NixOS/nixpkgs/issues/14897 .
Also relevant:
- https://github.com/NixOS/nixpkgs/issues/16130
- https://github.com/commercialhaskell/stack/issues/2259
2016-07-21 14:41:44 +02:00
203846b9de
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-07-19 10:37:02 +00:00
1b9f6732c7
diff-so-fancy: 0.10.0 -> 0.10.1 ( #17033 )
2016-07-17 17:53:51 +02:00
5185bc1773
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-07-15 14:41:01 +00:00
8c09317018
git: 2.9.0 -> 2.9.1
2016-07-13 15:43:49 +02:00
beec2ba127
diff-so-fancy: 0.9.3 -> 0.10.0
2016-07-05 22:54:14 +02:00
117fb73965
git-ant-tools.git-extras: 3.0.0 -> 4.1.0
2016-06-25 14:21:16 +02:00
bd01fad0ed
Captialize meta.description of all packages
...
In line with the Nixpkgs manual.
A mechanical change, done with this command:
find pkgs -name "*.nix" | \
while read f; do \
sed -e 's/description\s*=\s*"\([a-z]\)/description = "\u\1/' -i "$f"; \
done
I manually skipped some:
* Descriptions starting with an abbreviation, a user name or package name
* Frequently generated expressions (haskell-packages.nix)
2016-06-20 13:55:52 +02:00
552388f8df
diff-so-fancy: init at 0.9.3
...
Script was mentioned at GitHub blog -
https://github.com/blog/2188-git-2-9-has-been-released :)
2016-06-17 13:38:59 +03:00
420b3c37ef
git: fix perl shebangs in contrib
...
There are a lot of scripts in contrib (e.g. `diff-highlight`) that
contain perl shebang line. But `patchShebangs` is unablle to fix this
without explicitly listing `perl` in `buildInputs`.
2016-06-16 23:47:56 +03:00
8d3df9f6c4
git: 2.8.3 -> 2.9.0
2016-06-15 10:56:29 -04:00
8031cba2ab
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-06-10 09:27:04 +00:00
7eb671ebcd
no more goPackages
2016-06-09 13:08:00 +02:00
1845843cdd
git-annex: take this tool from LTS Haskell while Stackage Nightly is broken
2016-06-06 09:33:30 +02:00
bac26e08db
Fix lots of fetchgit hashes (fallout from #15469 )
2016-06-03 17:17:08 +03:00
2d382f3d98
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-05-30 19:39:34 +00:00
5c1f0990e3
hub: fix incorrect hash ( #15830 )
2016-05-30 14:23:32 +01:00
e4832c7541
Merge branch 'staging'
...
Includes a security update of libxml2.
2016-05-27 15:58:40 +02:00
800de8db21
git: 2.8.0 -> 2.8.3
2016-05-27 14:58:48 +02:00
c4661e9643
Merge: make dev output references explicit
...
This is a rebase of most commits from #14766 ,
resolving conflicts and a few other evaluation problems.
2016-05-22 12:09:23 +02:00
29694b43b6
treewide: Make explicit that 'dev' output of apr is used
2016-05-19 10:00:24 +02:00
f8d481754c
Merge remote-tracking branch 'origin/master' into hardened-stdenv
2016-05-18 17:10:02 +02:00
b49bf121b8
rename iElectric to domenkozar to match GitHub
2016-05-17 13:00:47 +01:00
8e462995ba
Bring my stdenv.lib.maintainers user name in line with my github nick.
2016-05-16 22:49:55 +02:00
65a9fa8cdc
Merge branch 'master' into staging
2016-05-08 21:24:48 +02:00
f5668437ab
hub: 2.2.2 -> 2.2.3
2016-05-06 10:39:29 +03:00
9820cb1bf2
use dontBuild instead of hacks
...
changes:
* buildPhase = "true"
* buildPhase = ":"
2016-05-04 10:11:04 +00:00
c92bca56f8
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-05-02 22:58:02 +00:00
6cf44fed13
Merge pull request #15113 from rardiol/gitSVN
...
git: fix subversion bindings for multiple outputs
2016-05-01 10:10:31 +01:00
e5a9d64787
git: fix subversion bindings for multiple outputs
2016-04-30 13:19:14 -03:00
d2b176ace5
Merge pull request #14617 from nathan7/git-ssl-cert-file
...
git: respect $SSL_CERT_FILE
2016-04-29 23:03:52 +01:00
aa8bc97dd6
git-hub -> gitAndTools.git-hub (with alias)
2016-04-29 21:42:35 +02:00
2415254a52
git-hub: 0.9.0 -> 0.10
2016-04-29 21:42:35 +02:00
e5e09e8cc7
svn2git-kde: move to qmake4Hook
2016-04-20 18:55:48 +03:00
9325393959
qgit-git: move to qmake4Hook
2016-04-20 18:55:48 +03:00
a4e868a102
qgit: move to qmake4Hook
2016-04-20 18:55:48 +03:00
661641aeb7
git-and-tools: move to callPackage
2016-04-20 18:55:48 +03:00
d020caa5b2
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-04-18 13:49:22 +00:00
9eced61d2a
git: respect $SSL_CERT_FILE
...
This allows git to work on systems without
/etc/ssl/certs/ca-certificates.crt, such as OS X, instead of failing
with "error setting certificate verify locations".
2016-04-12 11:47:56 +02:00
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
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
2e08d8234e
Merge remote-tracking branch 'origin/master'
2016-03-31 10:06:30 +02:00
318fdda01c
git-cola: 2.2.1 -> 2.5
2016-03-30 20:25:50 +02:00
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
a4e65c3639
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-03-30 09:01:20 +00:00
69c6f7e20a
git: 2.7.4 -> 2.8.0
2016-03-29 07:21:41 +01:00
f60c9df0ba
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-03-28 15:16:29 +00:00
6579acd015
git: add openssh as a runtime dependency
...
Fixes #1923
2016-03-26 14:39:57 +00:00
31c317e09e
git: 2.7.3 -> 2.7.4
2016-03-18 18:07:33 -07:00
abcf57a8db
git: update from version 2.7.1 to 2.7.3
2016-03-16 21:35:55 +01:00
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
e9fc4e7db6
Merge remote-tracking branch 'origin/master' into hardened-stdenv
2016-03-07 22:08:27 +01:00
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
aff1f4ab94
Use general hardening flag toggle lists
...
The following parameters are now available:
* hardeningDisable
To disable specific hardening flags
* hardeningEnable
To enable specific hardening flags
Only the cc-wrapper supports this right now, but these may be reused by
other wrappers, builders or setup hooks.
cc-wrapper supports the following flags:
* fortify
* stackprotector
* pie (disabled by default)
* pic
* strictoverflow
* format
* relro
* bindnow
2016-03-05 18:55:26 +01:00
fed49425c5
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-03-03 16:11:55 +00:00
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
3b4765c9e5
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-02-28 16:32:57 +00:00
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
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
3477e662e6
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-02-27 00:08:08 +00:00
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
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
fe6ad9e912
git-stree: init at 0.4.5
2016-02-25 15:26:06 -08:00
ca5f243697
git-and-tools: alphabetize attributes before it gets too huge
2016-02-25 14:23:34 -08:00
677893f92b
Merge pull request #13422 from k0ral/git
...
git: 2.7.0 -> 2.7.1
2016-02-24 15:09:28 +01:00
c1504c5a94
git: 2.7.0 -> 2.7.1
2016-02-24 13:47:23 +01:00
11733b39b5
git: fixes references to gettext properly
...
A better implementation of 5273dbf530https://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
bc21db3692
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-02-19 21:16:14 +00:00
4d06bf70f4
buildPythonApplication: use new function for Python applications
2016-02-19 13:16:41 +01:00
e9520e81b3
Merge branch 'master' into staging
2016-02-17 10:06:31 +01:00
c38eb526d5
git: fix references to gettext in bash scripts
...
See #13047
2016-02-16 21:01:21 +00:00
c9aceaea86
gitAndTools.qgit: turn off format hardening
2016-02-09 11:04:13 +00:00
54299b60c4
Merge #12779 : Mass replace `pkg}/bin`-style strings
...
... to refer to correct outputs
2016-02-03 17:25:22 +01:00
ae74c356d9
Merge recent 'staging' into closure-size
...
Let's get rid of those merge conflicts.
2016-02-03 16:57:19 +01:00
9f358f809d
Configure a default trust store for openssl
2016-02-03 12:42:01 +01:00
e97e690244
treewide: Mass replace 'xz}/bin' to refer the 'bin' output
2016-02-01 20:46:28 +02:00
5f4a8de754
treewide: Mass replace 'bzip2}/bin' to refer the 'bin' output
2016-02-01 20:45:57 +02:00
f6d3b7a2ae
switch hardening flags
2016-01-30 16:36:57 +00:00
954e9903ad
Use a hardened stdenv by default
2016-01-30 16:36:57 +00:00
f7578a4d32
gitflow: 1.8.0 -> 1.9.1
2016-01-27 17:15:42 +01:00
890f000146
goPackages.git-annex-remote-b2: init at 0.2
2016-01-26 17:54:53 +01:00
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
716aac2519
Merge branch 'staging' into closure-size
2016-01-19 09:55:31 +01:00
2d0893088f
Merge branch 'master' into staging
2016-01-15 13:43:57 +01:00
c169718a6b
git-bz: fix meta typo
...
Thanks to @heydojo.
2016-01-15 10:26:18 +01:00
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
36a68c8b6b
git-bz: 3.20110902 -> 3.2015-09-08
2016-01-15 05:31:47 +01:00
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
2c4c9bee13
git: 2.6.4 -> 2.7.0
...
Also corrected the license, which is GPL2-only
2016-01-05 22:15:17 -08:00
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
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
090efc2907
subgit: init at 3.1.0
2015-12-28 22:59:23 -05:00
6108bb8971
hub: 2.2.1 -> 2.2.2
2015-12-23 08:37:02 -08:00
e5b15f6b52
Merge pull request #11838 from k0ral/git
...
git: 2.6.3 -> 2.6.4
2015-12-20 11:55:57 +01:00
016e88b2d2
git: 2.6.3 -> 2.6.4
2015-12-19 17:37:37 +00:00
85375fc5fc
git-crypt needs GnuPG
2015-12-17 11:00:50 +03:00
5b0352a6a4
Merge branch 'master' into closure-size
2015-12-11 18:31:00 +01:00
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
920b1d3591
Merge branch 'master' into closure-size
2015-11-29 16:50:26 +01:00
2798b02ad0
Convert some *Flags from strings to lists
2015-11-26 23:45:31 +01:00
69e7f3bb74
switch to zero underscores for sandbox profiles; remove generateFrameworkProfile
2015-11-21 12:10:33 -08:00
a63346e33c
use single underscore for sandboxProfile
2015-11-21 11:17:30 -08:00
333d69a5f0
Merge staging into closure-size
...
The most complex problems were from dealing with switches reverted in
the meantime (gcc5, gmp6, ncurses6).
It's likely that darwin is (still) broken nontrivially.
2015-11-20 14:32:58 +01:00
df80090d09
use per-derivation sandbox profiles
2015-11-19 11:31:06 -08:00
6602f49495
Revert "Revert "Merge pull request #9543 from NixOS/staging.post-15.06""
...
This reverts commit 741bf840da
2015-11-14 12:32:51 -08:00
9579c9ec7f
Merge commit 'cb21b77' into master.upstream
...
This is a partial merge of staging for builds which are working
2015-11-13 15:53:10 -08:00
221965a918
tig: add libiconv dep on darwin
2015-11-07 13:51:43 +01:00
1e7aa4f17d
Merge branch 'master.upstream' into staging.upstream
2015-11-05 18:30:11 -08:00
ebedbec72b
git: 2.6.2 -> 2.6.3
2015-11-05 18:18:21 -08:00
dd2de66d61
Merge branch 'master.upstream' into staging.upstream
2015-10-30 17:16:07 -07:00
c5579c9184
subversion: fixup some referrers after splitting
2015-10-28 10:22:59 +01:00
8e7d39835f
transcrypt: init at 0.9.7
2015-10-25 23:22:21 +00:00
4917a4f8b3
Merge master into staging
2015-10-23 01:57:14 +02:00
cc2f78573e
git: 2.5.3 -> 2.6.2
2015-10-18 17:23:51 -07:00
8a44a36ca4
Merge branch 'master.upstream' into staging.upstream
2015-10-15 10:22:28 -07:00
b41742414e
git-crypt: update maintainer
2015-10-14 21:46:27 +08:00
741bf840da
Revert "Merge pull request #9543 from NixOS/staging.post-15.06"
...
This reverts commit f61176c539a27ca029ee
2015-10-06 15:24:20 +02:00
910dfd53bd
git-hub: minor clean-up
...
Move meta out of the way; inherit the GitHub home page from src;
`with platforms; linux` -> `platforms.linux`.
2015-10-02 05:34:34 +02:00
05fab76355
gitAndTools.git-extras: 2.2.0 -> 3.0.0
2015-09-29 12:27:22 +02:00
25dbb2d8bc
git: 2.5.2 -> 2.5.3
2015-09-23 12:30:00 -07:00
76ef7a93e3
Merge: xlibs and x11 attribute cleanup
...
Frequently using multiple *almost* identical attributes is bad.
2015-09-23 10:42:34 +02:00
07f8f50c6d
git-annex: build w/o assistant in Stackage, with assistant for Nixpkgs
2015-09-19 08:20:54 +02:00
88c9f8b574
xlibs: replace occurrences by xorg
...
This seems to have been confusing people, using both xlibs and xorg, etc.
- Avoided renaming local (and different) xlibs binding in gcc*.
- Fixed cases where both xorg and xlibs were used.
Hopefully everything still works as before.
2015-09-15 12:54:34 +02:00
eb7404d97a
all-packages: Use callPackage where possible
2015-09-14 22:27:19 -06:00
b127f88711
git: 2.5.1 -> 2.5.2
2015-09-13 20:09:19 -07:00
e77b9fff67
git-radar: init at 0.3.2
2015-09-08 08:44:51 +02:00
6f19418b65
git: 2.5.0 -> 2.5.1
2015-08-31 10:27:07 -07:00
481d2acea8
git-hub: remove files not needed on Nix
2015-08-17 23:21:50 +02:00
f3cb701085
git-crypt: init at 0.5.0
2015-08-08 17:04:07 +08:00
525c901ce9
Make svn2git visible to nix-env
2015-08-05 14:33:12 +02:00
9657be0b95
svn2git-kde: Mark as broken
...
The source repository no longer exists.
2015-08-05 14:33:03 +02:00
0e947e00a0
git: 2.4.6 -> 2.5.0
2015-07-29 18:15:08 -07:00
9f37e91ec5
Merge master into staging
...
There are larger-rebuild changes: gnutls and samba.
2015-07-17 06:38:04 +02:00
d7b917e612
git: 2.4.5 -> 2.4.6
2015-07-16 20:07:17 -07:00
333f145d76
Merge branch 'master.upstream' into staging.upstream
2015-07-13 15:11:31 -07:00
d1221f46e9
nixpkgs: git 2.4.4 -> 2.4.5
...
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-07-09 01:33:46 -05:00
35ca7fae8e
nixpkgs: git - link git-http-backend into $PATH
...
This makes it easier for tools (like Phabricator) to find
git-http-backend to enable HTTP(S) transport support.
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-07-09 01:33:15 -05:00
282d03befa
Merge branch 'master.upstream' into staging.upstream
2015-06-22 10:57:36 -07:00
01e43fcd1d
gitflow: 1.7.0 -> 1.8.0
2015-06-22 12:17:50 +02:00
ed4b17bbd8
Merge pull request #8424 from bobvanderlinden/gitcola-2.2.1
...
git-cola: update from 2.1.1 to 2.2.1
2015-06-22 08:42:53 +02:00
3f66bb7ff2
Add myself as maintainer
2015-06-22 08:26:09 +02:00
a768954d63
git-cola: update from 2.1.1 to 2.2.1, potentially fixes CVE-2012-0845, CVE-2012-1150, CVE-2014-9365
2015-06-19 23:56:30 +02:00
fe4f8903b4
Merge branch 'master.upstream' into staging.upstream
2015-06-18 22:37:00 -07:00
7fd80890c7
git: 2.4.2 -> 2.4.4
2015-06-18 21:24:46 -07:00
4a57b07653
Merge remote-tracking branch 'origin/master' into staging
2015-06-11 00:18:24 +02:00
5a64cc1dc8
git: 2.4.1 -> 2.4.2
2015-06-10 16:22:23 +00:00
9d6555dc0a
Merge branch 'master.upstream' into staging.upstream
2015-06-06 12:04:42 -07:00
1a64d9251c
Add git-hub: command line GitHub interface
...
Rather cool, actually.
2015-06-02 23:58:03 +02:00
dc3316268e
Merge branch 'master' into staging
2015-06-01 11:00:51 +02:00
867d2c5c46
openssl: Remove References to OPENSSL_X509_CERT_FILE
2015-05-31 15:50:51 -07:00
b462c7908f
git-annex: on second thought, let's not break backwards compatibility for no apparent reason
2015-05-30 21:02:45 +02:00
9cc46aaa4a
git-annex: switch to the version built with GHC 7.10.1
...
Also, this change renames the "gitAnnex" attribute to "git-annex". This
seems more in-line with recent additions to the git package family,
which all used dashed names instead of camel-caps.
2015-05-30 19:54:42 +02:00
21247699ad
git: 2.4.0 -> 2.4.1
2015-05-15 18:38:13 -07:00
d40cf483cc
git: 2.3.6 -> 2.4.0
2015-05-09 11:46:31 +00:00
9254ee082e
git-cola: changed platform to Linux only
2015-05-08 13:41:02 +02:00
324719a5a6
Drop obsolete pre-NG Haskell builds.
2015-05-05 21:44:47 +02:00
f69cfbfa15
Merge pull request #7631 from KaiSforza/git-remote-hg
...
git-remote-hg: remove dbus, install built docs
2015-05-02 14:44:03 +02:00
bf7ad2d84f
meta.description fixups
...
Mostly scripted substitutions with a couple of subjective enhancements.
2015-04-30 18:17:42 +02:00
50fb7b312b
tig-2.1.1: version bump
2015-04-29 23:57:31 +02:00
9870ba1968
git-remote-hg: remove dbus, install built docs
...
dbus is unused in this package, no reason to include it in the
expression anywhere.
2015-04-29 09:58:04 -07:00
de808ae79f
Merge pull request #7276 from spwhitt/git-imerge
...
git-imerge: new package
2015-04-26 19:51:05 -05:00
ffe6539c98
git: 2.3.5 -> 2.3.6
2015-04-25 23:07:02 +00:00
805b9ed4bf
git-annex: use build from GHC 7.8.4 package set until 7.10.1 compiles this tool
2015-04-20 00:06:52 +02:00
d421a7b77b
git-and-tools/hub: 2.2.0-rc1 -> 2.2.1
2015-04-16 10:25:25 +03:00
943fd93c14
git-imerge: new package
2015-04-14 15:50:27 -04:00
aec35dfa58
Revert "git-imerge: new package"
...
This reverts commit 309d0f0c8b
2015-04-08 14:03:14 -05:00
309d0f0c8b
git-imerge: new package
2015-04-07 00:40:33 -04:00
844d88fe4c
Merge pull request #7146 from k0ral/git
...
git: 2.3.4 -> 2.3.5
2015-04-03 13:31:10 +02:00
d54b6c903d
git: 2.3.4 -> 2.3.5
2015-04-03 10:57:36 +00:00
06ea226495
cgit: 0.10.2 -> 0.11.2
2015-03-26 17:15:29 -07:00
cd3b460200
tig: 2.0.3 -> 2.1
2015-03-26 16:41:05 -07:00
940d381d73
git: 2.3.3 -> 2.3.4
2015-03-26 14:03:51 -07:00
8797078695
git: 2.3.2 -> 2.3.3
2015-03-17 17:18:12 +00:00
9b699bc9a9
Merge pull request #6705 from bobvanderlinden/gitcola
...
git-cola: add package
2015-03-11 15:35:37 +01:00
5d0cc81d08
git: 2.3.1 -> 2.3.2
...
(cherry picked from commit 50933385c5
2015-03-10 13:20:02 +01:00
a0da8638d6
git: 2.3.0 -> 2.3.1
...
(cherry picked from commit 36c1a8a6c7
2015-03-10 13:19:41 +01:00
08ea20df65
git-cola: add package
2015-03-08 01:39:29 +01:00
a78d164b1e
Minor fixes for git on darwin (libiconv and Security dependencies)
2015-02-17 22:30:59 -05:00
ad1417ed0e
git: update to version 2.3.0
2015-02-06 13:59:57 +01:00
2140080b08
Merge pull request #5750 from rycee/issue/5741
...
Wrap 'tig' command to add with git to PATH.
2015-01-28 14:52:45 +01:00
7149878010
git-annex: switch attribute over to haskell-ng package set some more
2015-01-22 23:29:09 +01:00
5adc98cc50
git-annex: switch attribute over to haskell-ng package set, which is more up-to-date
2015-01-22 23:25:40 +01:00
dfc225d143
Merge branch 'master' of github.com:nixos/nixpkgs into pleasant-ruby
...
Conflicts:
pkgs/applications/version-management/git-and-tools/default.nix
pkgs/applications/version-management/git-and-tools/hub/default.nix
pkgs/tools/audio/mpdcron/default.nix
2015-01-20 20:21:03 -05:00
98556ef150
git-remote-hg: fix compatibility with mercurial 3.2
...
Close #5458 .
2015-01-20 15:49:59 +01:00
db01e50f6a
Wrap 'tig' command to add with git to PATH.
...
This ensures that git is added as a run-time dependency of tig and
allows tig to find the git command even if git is not installed in the
user environment. Fixes #5741 .
2015-01-13 23:12:35 +01:00
41b53577a8
unmaintain a bunch of packages
2015-01-13 22:33:49 +01:00
947a4c582e
hub: Fix build with chrooted Nix.
...
The build script is a shell script which has a shebang using
/usr/bin/env, which isn't available in a chrooted Nix daemon.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-01-12 03:05:40 +01:00
269568b7ea
Merge pull request #5565 from kirelagin/hub
...
gitAndTools.hub: Update to 2.x
2015-01-10 10:42:19 +03:00
d8c600c129
haskell-git-annex: update to version 5.20141231
2015-01-05 18:39:18 +01:00
4b84049bd3
gitAndTools.hub: Update to 2.x
2015-01-04 02:28:38 +03:00
58ae62b9fa
hub: add git as a dependency of the expression
2015-01-03 07:53:01 -05:00
c087c456af
Merge pull request #5510 from k0ral/fast-export
...
fast-export: update to last revision from upstream
2014-12-31 01:19:42 +03:00
10b3d1ad7b
fast-export: update to last revision from upstream
2014-12-30 14:54:12 +01:00
c64257b8e5
Fix user-facing typos (mainly in descriptions)
2014-12-30 03:31:03 +01:00
145733c479
Merge branch 'master' of github.com:nixos/nixpkgs into pleasant-ruby
...
Conflicts:
pkgs/applications/version-management/redmine/default.nix
pkgs/development/interpreters/ruby/gem.nix
pkgs/development/interpreters/ruby/generated.nix
pkgs/development/interpreters/ruby/patches.nix
pkgs/development/tools/vagrant/default.nix
pkgs/servers/consul/default.nix
2014-12-28 14:29:52 -05:00
8298636254
haskell-git-annex: update to version 5.20141219
2014-12-25 11:05:49 +01:00
7800270ae4
[SECURITY] Update git to 2.1.4
...
This fixes CVE-2014-9390
http://article.gmane.org/gmane.linux.kernel/1853266
2014-12-19 14:05:04 +00:00
1a0505143c
haskell-github-backup: update to version 1.20141204
2014-12-13 12:06:02 +01:00
dcad10c8e6
haskell-git-annex: Add maintainer, was removed by mistake.
2014-12-04 21:49:15 +01:00
81cb2c144c
haskell-git-annex: update to version 5.20141203
2014-12-04 14:45:54 +01:00
45c1b9147f
Merge pull request #5130 from wmertens/git-ssl-env
...
Let git use $SSL_CERT_FILE
2014-11-27 13:24:08 +01:00
fdbd5e1323
New package: git-extras
2014-11-25 20:24:43 -05:00
272f2c365c
git: Support $SSL_CERT_FILE
2014-11-26 00:29:37 +01:00
e51afe5e7c
fix hub
2014-11-18 04:07:30 +00:00
d1cec0c92d
haskell-github-backup: update to version 1.20141110
2014-11-13 14:51:36 +01:00
1b9f756e4e
git: do not do install-doc when !withManual
2014-11-12 17:36:17 +02:00
cf8f4963a7
rename rubyLibs to rubyPackages
2014-11-09 22:16:58 +00:00
820f6f2e4c
haskell-git-annex: update to version 5.20141125
2014-11-09 14:59:30 +01:00
007f80c1d0
Turn more licenses into lib.licenses style
...
Should eval cleanly, as far as -A tarball tells me.
Relevant: issue #2999 , issue #739
2014-11-06 00:48:16 +00:00
0a2e12e046
haskell-github-backup: update to version 1.20141031
2014-11-01 21:08:04 +01:00
23048155b7
git: Update to 2.1.3
2014-10-30 17:22:47 +01:00
8b12277065
haskell-git-annex: update to version 5.20141024
2014-10-26 23:44:48 +01:00
cc48a930ae
haskell-git-annex: update to version 5.20141013
2014-10-18 17:48:48 +02:00
ba22560768
git-annex: temporary patch to build the current version
2014-10-16 17:23:01 -05:00
38751005a1
git-annex: broken by update to 'persistent' and 'yesod'
2014-10-14 17:39:35 +02:00
066db30729
haskell-git-annex: update to version 5.20140927
2014-10-06 11:21:39 +02:00
16494e0289
git: Update to 2.1.2
2014-10-03 23:13:38 +08:00
8ea7e926cc
Add myself to the maintainers list
2014-09-21 02:13:28 +01:00
b4437f36c3
New package: git-remote-gcrypt.
...
A git remote for working with encrypted git repositories.
Closes #4100
2014-09-21 02:13:28 +01:00
82a46ebb5c
haskell-git-annex: update to version 5.20140919
2014-09-20 18:00:04 +02:00
89438059ab
haskell-git-annex: update to version 5.20140915
2014-09-17 21:16:10 +02:00
70caf9d865
git-annex: broken by optparse-applicative 0.10.x
...
Bug has been reported upstream.
2014-09-14 00:06:45 +02:00
7d0a7ed62c
gitAndTools.tig: update from 2.0.2 to 2.0.3
2014-09-13 22:25:17 +02:00
78e5e556cc
Revert "fixes #1923 "
...
This reverts commit 1849840aa3
2014-09-09 12:11:53 +02:00
1849840aa3
fixes #1923
2014-09-08 21:19:14 +02:00
32a3b65571
cgit: update from 0.10.1 to 0.10.2
2014-09-04 19:31:32 +02:00
332395b262
Add myself as a maintainer to a bunch of packages.
2014-09-04 17:05:21 +02:00
0863bcb683
gitAndTools.hub: update from 1.12.0 to 1.12.2, potentially fixes CVE-2014-0177
2014-09-04 17:05:20 +02:00
e5878fa70b
git-annex: re-build expression with latest cabal2nix
2014-09-04 16:20:57 +02:00
4678ddc1c0
gitAndTools.svn2git: update from 2.2.5 to 2.3.2
2014-09-04 16:06:41 +02:00
ccd4a52f68
haskell-git-annex: update to version 5.20140831
2014-09-02 11:48:19 +02:00
c9baba9212
Fix many package descriptions
...
(My OCD kicked in today...)
Remove repeated package names, capitalize first word, remove trailing
periods and move overlong descriptions to longDescription.
I also simplified some descriptions as well, when they were particularly
long or technical, often based on Arch Linux' package descriptions.
I've tried to stay away from generated expressions (and I think I
succeeded).
Some specifics worth mentioning:
* cron, has "Vixie Cron" in its description. The "Vixie" part is not
mentioned anywhere else. I kept it in a parenthesis at the end of the
description.
* ctags description started with "Exuberant Ctags ...", and the
"exuberant" part is not mentioned elsewhere. Kept it in a parenthesis
at the end of description.
* nix has the description "The Nix Deployment System". Since that
doesn't really say much what it is/does (especially after removing
the package name!), I changed that to "Powerful package manager that
makes package management reliable and reproducible" (borrowed from
nixos.org).
* Tons of "GNU Foo, Foo is a [the important bits]" descriptions
is changed to just [the important bits]. If the package name doesn't
contain GNU I don't think it's needed to say it in the description
either.
2014-08-24 22:31:37 +02:00
3fad02dab8
haskell-git-annex: update to version 5.20140817
2014-08-19 23:47:59 +02:00
d809e775e8
git: Add git-prompt.sh to /etc/bash_completion.d.
...
This will make the git-prompt.sh features available to bash users when
completions are enabled. It is done in this way in Debian/Ubuntu as well.
2014-08-19 16:34:51 +02:00
1916bc0412
git: Update to 2.1.0
2014-08-17 06:18:38 +02:00
e823c123a8
Don't build broken Haskell packages on Hydra.
...
These packages don't compile:
- cabal-delete
- cabal-file-th
- categories
- cmdtheline
- codec-image-devil
- concurrent-extra
- cryptol 1.8.x
- data-lens
- diagrams-postscript
- djinn
- download
- dstring
- enummapset
- git-date
- github-backup
- gtkglext
- happyy-meta
- haskeline-class
- pakcs
These packages depend on some of the packages listed before:
- Chart-diagrams
- data-lens-template
- hp2any-manager
- purescript
- repr
These packages fail with GHC 7.8.3 but still compile with older compilers:
- happy: 1.18.4, 1.18.5, 1.18.6
2014-08-12 12:37:44 +02:00
2d326e5032
Merge remote-tracking branch 'origin/master' into staging.
...
Conflicts:
pkgs/desktops/e18/enlightenment.nix
2014-08-04 16:51:47 +02:00
7a45996233
Turn some license strings into lib.licenses values
2014-07-28 11:31:14 +02:00
f64d84698e
Merge remote-tracking branch 'origin/master' into staging
...
Conflicts:
pkgs/applications/audio/espeak/edit.nix
pkgs/applications/audio/lmms/default.nix
pkgs/desktops/e18/enlightenment.nix
pkgs/games/exult/default.nix
pkgs/os-specific/linux/alsa-plugins/default.nix
2014-07-28 11:30:49 +02:00
62bb741348
haskell-github-backup: update to version 1.20140721
2014-07-22 14:20:57 +02:00
7f410ef923
Merge remote-tracking branch 'origin/master' into staging
...
Conflicts:
pkgs/misc/vim-plugins/default.nix
2014-07-22 11:00:00 +02:00
4201db70ed
git: Update to 2.0.2
2014-07-20 23:49:45 +08:00
73e0c50b30
haskell-git-annex: fix for darwin
...
@peti I don't see in the cabal2nix repository how to change the
buildDepends for git-annex the way that I need to. Can you offer some
guidance there?
2014-07-18 18:37:54 -05:00
92faa6a009
haskell-git-annex: update to version 5.20140717
2014-07-18 17:30:47 +02:00
d24df6e334
haskell-git-annex: corrections for darwin
2014-07-16 01:27:29 -05:00
b9d19af3e6
Merge remote-tracking branch 'origin/master' into staging
2014-07-15 12:14:35 +02:00
5bfb58a8a2
Re-generate Haskell packages with cabal2nix.
2014-07-14 17:33:52 +02:00
56c569a9cd
haskell-github-backup: update to version 1.20140707
2014-07-14 17:33:51 +02:00
af88d71b55
haskell-git-annex: update to version 5.20140709
2014-07-14 17:33:50 +02:00
ff97b7dbe6
Merge remote-tracking branch 'origin/master' into staging
2014-07-14 17:04:55 +02:00
d2e731e111
Add "please don't edit" comment at the top of every auto-generated Haskell file.
2014-07-14 13:21:41 +02:00
a25c35b89b
git-annex: Allow building on darwin again
2014-07-09 17:52:18 -05:00
f7f1e3f842
haskell-git-annex: update to version 5.20140707
2014-07-08 15:58:22 +02:00
06fc1ec34d
Merge remote-tracking branch 'origin/master' into staging
...
Conflicts:
pkgs/servers/serfdom/default.nix
2014-07-01 11:25:41 +02:00
40f7b0f9df
Another attempt to eradicate ensureDir
...
See c556a6ea46
2014-06-30 14:56:10 +02:00
71812277d3
git-remote-add: new package added
2014-06-28 14:15:31 +01:00
bf1f2c6b1f
git: Updated to 2.0.1 ( close #3096 )
2014-06-26 16:54:48 +02:00
ba048baaff
tig: enable command line history/completion support
...
Since version 2.0, tig can use readline for history/completion support,
so add readline as a build input.
Increases closure size from 53 MiB to 54 MiB.
2014-06-21 19:57:36 +02:00
476700d56f
git-annex: Build on Darwin, let Cabal determine proper flags
2014-06-21 09:20:46 -07:00
92082524a9
Revert "add OPENSSL_X509_CERT_FILE to the `git` command environment"
...
This reverts commit 88b5578a57http://hydra.nixos.org/build/11995872/nixlog/1/raw >.
2014-06-21 13:15:50 +02:00
88b5578a57
add OPENSSL_X509_CERT_FILE to the `git` command environment
2014-06-16 21:55:43 -04:00
c5b7e2a2f2
haskell-git-annex: update to version 5.20140613
2014-06-16 16:12:36 +02:00
d0365a6cde
git-annex: build on Darwin, and rely on cabal to set flags
...
Fixes #2519
2014-06-10 02:28:23 +00:00
1a1c1ba734
haskell-git-annex: update to version 5.20140606
2014-06-09 10:26:59 +02:00
8c14496987
haskell-git-annex: update to version 5.20140529
2014-06-09 10:26:53 +02:00
db8ba58402
tig: update to 2.0.2
2014-06-01 14:39:55 +01:00
61befa0451
git: Update to 1.9.4
2014-05-31 09:47:21 +02:00
8de29ff4e1
haskell-git-annex: update to version 5.20140517
2014-05-21 23:04:30 +02:00
b8ca39e2f2
cgit: improve a comment
2014-05-17 11:01:57 +02:00
10fa1bcf66
git: Update to 1.9.3
2014-05-15 16:15:09 +02:00
551cae1aa0
haskell-git-annex: update to version 5.20140421
2014-04-29 01:35:45 +02:00
d304b277bd
Silence some Hydra evaluation warnings
2014-04-24 15:40:55 +02:00
c2516c30e3
haskell-git-annex: update to version 5.20140412
2014-04-23 11:17:07 +02:00
a1af25033a
git send-email: Respect $OPENSSL_X509_CERT_FILE
2014-04-16 18:43:39 +02:00
cfe42425c3
On Darwin, set NO_APPLE_COMMON_CRYPTO=1 for git builds
2014-04-14 14:53:15 -05:00
2661400d2a
cgit: bump git version to 1.9.2
...
This also updates the download URL to use kernel.org
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-04-13 00:47:16 -05:00
010132e302
Change several package constraints from linux to unix
...
They all build on Darwin.
2014-04-12 16:01:16 -05:00
ab12d10f87
git: Update to 1.9.2
2014-04-10 02:02:59 +02:00
1682bde4e0
gitAndTools.svn2git: update from 2.2.2 to 2.2.5
2014-04-09 12:41:10 +02:00
c244d6e1b8
gitAndTools.stgit: update from 0.16 to 0.17.1
2014-04-09 12:41:10 +02:00
ff49602b17
haskell-git-annex: update to version 5.20140405
2014-04-07 17:06:34 +02:00
9000db8b1e
haskell-git-annex: update to version 5.20140402
2014-04-06 21:53:16 +02:00
a68c12d35b
git: Remove phony not-supported wrappers.
...
Fixes #1751
2014-04-05 18:39:53 -04:00
fa62ab13de
haskell-git-annex: update to version 5.20140320
2014-03-22 09:04:46 +01:00
4e385c272c
git: Update to 1.9.1
2014-03-20 15:44:25 +01:00
36ee5c61c3
Rename git -> git-minimal, git-full -> git
...
Since most people probably want the full Git.
2014-03-11 17:00:17 +01:00
5a92a3a296
cgit: update from 0.10 to 0.10.1
2014-03-08 18:24:16 +02:00
39175f5117
haskell-git-annex: update to version 5.20140306
2014-03-08 11:27:29 +01:00
aa8ef327e4
gitAndTools.gitflow: update from 1.6.1 to 1.7.0
2014-03-03 11:10:27 +01:00
97298922e5
gitAndTools.hub: update from 1.11.1 to 1.12.0
2014-03-03 11:10:27 +01:00
8cd17a8b03
haskell-git-annex: update to version 5.20140227
2014-02-28 13:01:00 +01:00
007611cf4b
haskell-git-annex: update to version 5.20140221
2014-02-22 09:19:18 +01:00
534654e118
git: fix typos in comments
2014-02-15 12:05:44 +01:00
68b3fd33a7
git: Update to 1.9.0
2014-02-15 11:19:38 +01:00
30e1186a0c
haskell-git-annex: update to version 5.20140210
2014-02-10 21:45:43 +01:00
5b41db9765
git: update to 1.8.5.4 ( close #1714 )
2014-02-09 10:06:22 +01:00
61d37c62c3
hub: Update from 1.10.6 -> 1.11.1
2014-02-02 13:42:07 +00:00
1124a4ab08
haskell-git-annex: update to version 5.20140129
2014-01-30 08:32:41 +01:00
63ec2bec8f
haskell-git-annex: update to version 5.20140127
2014-01-28 14:59:46 +01:00
e2a858379d
haskell-git-annex: update to version 5.20140116
2014-01-26 00:02:33 +01:00
ac6761c908
Merge master into stdenv-updates
...
Conflicts:
pkgs/applications/version-management/gource/default.nix
pkgs/top-level/all-packages.nix
2014-01-20 19:39:28 +01:00
1e3289efb4
cgit: fix snapshot feature by using full paths to gzip/bzip2/xz
2014-01-19 22:59:51 +01:00
3a917b5c2d
cgit: enable lua support
...
Filters can now take advantage of the built-in lua interpreter (much
faster than fork and exec).
2014-01-19 22:46:53 +01:00
8c25a73def
cgit: update from 0.9.2 to 0.10
2014-01-19 22:12:12 +01:00
a2c316288c
Merge master into stdenv-updates
...
Conflicts:
pkgs/development/lisp-modules/stumpwm/default.nix (auto-solved)
pkgs/top-level/all-packages.nix (trivial)
2014-01-12 12:29:24 +01:00
18626481ca
haskell-git-annex: update to version 5.20140108
2014-01-11 12:03:41 +01:00
6750feec2c
haskell-git-annex: update to version 5.20140107
2014-01-09 00:45:16 +01:00
c70c8a7158
git-annex: try to fix test suite
2014-01-06 12:09:58 +01:00
75090c7c86
haskell-git-annex: update to version 5.20131230
2014-01-06 12:09:55 +01:00
e740b565cf
Merge master into stdenv-updates
...
Conflicts (easy):
pkgs/development/compilers/llvm/default.nix
pkgs/development/compilers/openjdk/default.nix
pkgs/development/libraries/icu/default.nix
pkgs/development/libraries/libssh/default.nix
pkgs/development/libraries/libxslt/default.nix
pkgs/development/tools/parsing/bison/3.x.nix
2013-12-29 10:01:22 +01:00
a4462d9a03
git-annex: fix build some more
2013-12-23 22:30:43 +01:00
47a3ece984
git-annex: disable test suite to fix build
...
The "lock" test fails. Upstream knows this, and apparently the failure
is caused by a bug in the test suite -- not in the application code.
2013-12-23 22:30:43 +01:00
2ac0fedb60
haskell-git-annex: update to version 5.20131221
2013-12-23 22:30:42 +01:00
8fa0f4debf
gitAndTools.git: update from 1.8.5.1 to 1.8.5.2
2013-12-18 18:18:28 +02:00
45e8de9a7d
Merge branch 'origin/master' into stdenv-updates.
...
Conflicts:
pkgs/tools/misc/less/default.nix
2013-12-16 21:13:24 +01:00
903e36a74c
git-annex: fix build some more
2013-12-14 22:05:17 +01:00
e706edb8ee
git-annex: disable test suite in this version to fix the build
2013-12-14 21:34:34 +01:00
f449007ade
haskell-git-annex: update to version 5.20131213
2013-12-14 15:19:27 +01:00
2bc29e4e6d
Merge branch 'master' into stdenv-updates.
2013-12-10 22:29:20 +01:00
c0fc46516d
haskell-github-backup: update to version 1.20131203
2013-12-10 20:41:36 +01:00
486e7736df
Merge remote-tracking branch 'origin/master' into stdenv-updates.
...
Conflicts:
pkgs/tools/networking/p2p/amule/default.nix
2013-12-10 00:25:54 +01:00
b4f93af3c9
Update git and related tools to latest releases.
...
Git -> 1.8.5.1
stgit -> 0.16
svn2git -> 2.2.2
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
2013-12-09 00:15:25 +00:00
c32bf83301
Merge remote-tracking branch 'origin/master' into stdenv-updates.
...
Conflicts:
pkgs/development/interpreters/perl/5.16/default.nix
pkgs/tools/networking/curl/default.nix
pkgs/top-level/all-packages.nix
pkgs/top-level/release-python.nix
pkgs/top-level/release-small.nix
pkgs/top-level/release.nix
2013-12-04 18:33:52 +01:00
d555031aa8
haskell-git-annex: update to version 5.20131130
2013-12-02 16:25:34 +01:00
5644003632
haskell-git-annex: update to version 5.20131120
2013-11-26 21:09:18 +01:00
e597d102d8
git: Update to 1.8.4.3
2013-11-14 15:29:58 +01:00
75ec0b31f8
haskell-git-annex: update to version 4.20131106
2013-11-11 14:39:57 +01:00
d72afe2f1b
haskell-github-backup: update to version 1.20131101
2013-11-11 14:39:51 +01:00
b8e890539e
tig: small expression cleanup
...
* Add a bit of whitespace to make it easier on the eyes
* Shorten the description (and remove package name)
2013-11-09 19:13:35 +01:00
9b6fb1ebd5
tig: bump 1.1 -> 1.2.1
...
XML_CATALOG_FILES is needed to be able to build the asciidoc
documentation/manpages in this new version.
2013-11-09 19:06:09 +01:00
576058fe0e
haskell-git-annex: update to version 4.20131101
2013-11-01 17:42:08 +01:00
609f8dc04b
Merge branch 'master' into stdenv-updates
...
Conflicts:
pkgs/top-level/all-packages.nix
2013-11-01 08:31:54 +01:00
11fd5db060
Add gitflow
...
A collection of Git extensions to provide high-level repository operations for Vincent Driessen's branching model
2013-10-30 11:37:57 +01:00
c05bf33b77
haskell-git-annex: update to version 4.20131024
2013-10-27 19:07:14 +01:00
6be8ad3392
Merge branch 'origin/master' into stdenv-updates.
...
There was a minor conflict in 'stumpwm'. The package needs texinfo
version 4.x. At least is used to, I'm not sure whether it still does.
2013-10-18 18:57:24 +02:00
b224e751c0
haskell-github-backup: update to version 1.20131006
2013-10-10 20:56:33 +02:00
85ecc3f176
haskell-git-annex: update to version 4.20131002
2013-10-03 21:29:51 +02:00
da17bd1352
git-annex: make sure the man page is installed
2013-10-03 17:16:19 +02:00
ac5d5297dd
Merge remote-tracking branch 'origin/master' into stdenv-updates.
2013-10-02 22:44:12 +02:00
eaa38dd941
haskell-git-annex: update to version 4.20130927
2013-10-02 22:33:41 +02:00
51c1d2d597
git: Update to 1.8.4
2013-09-30 17:19:06 +02:00
fd67fcb314
Fix chroot-build of fast-export & pinpoint revision to current HEAD.
...
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
2013-09-29 00:25:31 +02:00
9407832de4
Merge remote-tracking branch 'origin/master' into stdenv-updates.
...
Conflicts:
pkgs/development/libraries/gettext/default.nix
2013-09-23 10:59:44 +02:00
117176fd26
git-annex: patch to fix build with recent versions of 'dns' library
2013-09-18 18:09:17 +02:00
24366adf19
Merge remote-tracking branch 'origin/master' into stdenv-updates.
2013-09-14 15:28:40 +02:00
e541f509ca
git-annex: update to version 4.20130909
2013-09-11 19:59:33 +02:00
3d2caf1180
Merge remote-tracking branch 'origin/master' into stdenv-updates.
2013-09-08 22:54:35 +02:00
532cf20cbc
haskell-git-annex: update to version 4.20130827
2013-08-30 10:53:02 +02:00
98fcc2f746
Merge remote-tracking branch 'origin/master' into stdenv-updates.
2013-08-30 10:45:11 +02:00
efa748a166
git-and-tools/hub: Update to version 1.10.6.
...
This now uses fetchurl instead of fetchgit to speed up fetching.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-08-27 04:39:33 +02:00
9ac8ea937c
Merge branch 'origin/master' into stdenv-updates.
2013-08-26 12:21:23 +02:00
1392922727
haskell-git-annex: update to version 4.20130815
2013-08-18 18:49:10 +02:00
0d7118814b
Merge branch 'origin/master' into stdenv.
2013-08-17 10:00:16 +02:00
2e937c437a
unmaintain several packages
2013-08-16 23:45:01 +02:00
76244ac2e2
Merge branch 'master' into stdenv-updates
...
Conflicts:
pkgs/development/compilers/ghc/with-packages.nix
2013-08-16 22:51:13 +02:00
12f7c0666a
qgit version bump from 2.3 to 2.5
2013-08-11 14:35:23 +00:00
60a6e6802f
haskell-git-annex: update to version 4.20130802
2013-08-05 10:56:30 +02:00
65ad55c425
git-subtree: Remove
...
This package is obsolete because it's now part of git (see
https://github.com/apenwarr/git-subtree/blob/master/THIS-REPO-IS-OBSOLETE ).
2013-08-01 16:37:36 +02:00
80a82a2858
git: Install git-subtree
2013-08-01 16:36:54 +02:00
4ec1f8b68a
git: Update to 1.8.3.4
2013-08-01 16:26:02 +02:00
522acfd2f4
Merge remote-tracking branch 'master' into stdenv-updates.
...
Conflicts:
pkgs/applications/version-management/git-and-tools/git/default.nix
pkgs/top-level/all-packages.nix
2013-07-30 11:29:30 +02:00
ae7adcb6e4
git: find global configs in /etc/ instead of /etc
2013-07-29 23:40:54 +02:00
49335abfd2
haskell-git-annex: update to version 4.20130723
2013-07-26 19:40:47 +02:00
70835adb28
haskell-git-annex: update to version 4.20130709
2013-07-10 10:29:22 +02:00
40ad185891
git: update to version 1.8.3.2
2013-07-08 14:04:51 +02:00
8ba92b8895
Merge master into stdenv-updates
...
Conflicts (simple):
pkgs/development/tools/misc/binutils/default.nix
pkgs/tools/package-management/disnix/default.nix
pkgs/top-level/all-packages.nix
2013-07-08 10:48:05 +02:00
e533af98e4
git-annex: enable web-related features
2013-07-03 18:48:12 +02:00
4b75f5a2ae
haskell-git-annex: update to version 4.20130627
2013-07-01 12:11:01 +02:00
cbf48a8cd1
upgrade to texinfo5 for some packages
2013-07-01 07:52:14 +02:00
01bc9204e0
git-annex: fix installation of git-annex-shell
2013-06-22 15:41:37 +02:00
842420c3e1
Merge branch 'master' into stdenv-updates
...
Conflicts (relatively simple):
pkgs/development/interpreters/python/2.7/default.nix
pkgs/development/libraries/dbus/default.nix
pkgs/development/libraries/glib/default.nix
pkgs/development/libraries/glibc/2.17/common.nix
2013-06-20 19:21:25 +02:00
1a23f715f4
tig: built for linux
2013-06-18 22:42:12 +02:00
6b1ebeccf2
Merge branch 'master' into stdenv-updates.
...
There were conflicts in pkgs/development/interpreters/ruby/ruby-19.nix,
which I resolved to the best of my knowledge. I'd appreciate if some of
the ruby gurus could have a look at the outcome of my merge, though.
2013-06-11 12:11:25 +02:00
9c6f7cc9c1
Add package versions to some of the packages or fix existing ones to conform to nixpkgs conventions.
2013-06-07 03:15:45 +03:00
7b21e19a82
git-annex: generate build instructions with cabal2nix
2013-06-03 22:09:34 +02:00
6609df220b
Merge pull request #584 from bjornfor/cgit
...
cgit: new package
2013-06-02 14:13:05 -07:00
4ecd9cdb14
cgit: new package
...
cgit is a web frontend for git repositories - it is a CGI program to use
with your favourite webserver. Add the latest version, 0.9.2.
2013-06-02 18:25:54 +02:00
5718931dd3
Merge remote-tracking branch 'origin/master' into stdenv-updates.
2013-06-01 11:48:21 +02:00
6fadcc2d69
git-annex: disable building of the web application to fix the build in the presence of yesod 1.2
2013-05-30 12:33:40 +02:00
e7975c0d33
git-annex: update to version 4.20130521
2013-05-30 12:33:40 +02:00
728e305205
Merge remote-tracking branch 'origin/master' into stdenv-updates.
2013-05-22 12:30:02 +02:00
05bb66ce20
Add myself as maintainer for several packages
...
And set missing meta.platforms for the packages I've added earlier.
2013-05-20 20:28:15 +02:00
b9013993db
git: Update to 1.8.2.3
2013-05-14 11:53:28 +02:00
972b1a7d50
Download git-annex from github instead of git.kitenet.net
...
git.kitenet.net doesn't allow snapshot downloads anymore, the url
just returns 403 Forbidden.
2013-05-13 18:19:41 +02:00
fde3526e7d
Merge branch 'master' into stdenv-updates
...
Conflict in kerberos, which was updated both in master and in
stdenv-updates. Kept the stdenv-updates version, except pulled in the
enableParallelBuilding change from master.
Signed-off-by: Shea Levy <shea@shealevy.com>
Conflicts:
pkgs/development/libraries/kerberos/krb5.nix
2013-05-04 18:28:48 -04:00
7b868bbff4
git-annex: update to version 4.20130501
2013-05-03 11:38:58 +02:00
f2aaed44aa
git: Properly use symlinks instead of hard links
...
Git's Makefile has a NO_INSTALL_HARDLINKS flag to produce symlinks
instead of hard links. However, it still produces hard links between
$out/bin and $out/libexec, hence the patch.
Also, update Git to 1.8.2.1.
2013-04-22 15:55:01 +02:00
6ee8bca8ee
Revert "git: fix build on FreeBSD"
...
This reverts commit ab98d72fad
2013-04-22 15:26:26 +02:00
2ffd0b6dac
Merge changes from branch 'origin/master' into stdenv-updates.
2013-04-20 22:19:39 +02:00
88f1e643e3
git: fix gitweb.cgi runtime dependency on gzip
...
gitweb.cgi uses gzip for creating "snapshots". Without this patch it
doesn't work.
2013-04-19 22:32:51 +02:00
4914e63a89
Merge changes from branch 'master' into stdenv-updates.
...
Conflicts:
pkgs/development/libraries/icu/default.nix
pkgs/tools/misc/coreutils/default.nix
2013-04-19 11:48:11 +02:00
0911fe7f3c
haskell-github-backup: update to version 1.20130414
2013-04-14 23:06:17 +02:00
7a69341994
git-annex: drop obsolete dependency on testpack
2013-04-14 21:19:09 +02:00
0b4e664a24
git-annex: update to version 4.20130405
2013-04-13 00:13:22 +02:00
62e37492b9
Merge remote-tracking branch 'origin/master' into stdenv-updates.
2013-04-04 00:51:30 +02:00
e21c53c211
tig: enable bash completion
...
Copy the bash completion script that comes with tig to
$out/etc/bash_completion.d/.
Note: to enable bash completion in NixOS, set
environment.enableBashCompletion = true;
2013-04-01 18:37:52 +02:00
0823aea0a6
Merge branch 'master' into stdenv-updates.
...
Conflicts:
pkgs/development/libraries/libxslt/default.nix
Commit 1764ea2b0a
2013-03-25 13:43:45 +01:00
ab98d72fad
git: fix build on FreeBSD
...
Our hard-linking code depended on md5sum, which FreeBSD doesn't have in its
system environment. To avoid that impure dependency, the hard-linking is now
done with the 'hardlink' utility from Nixpkgs.
2013-03-25 12:47:39 +01:00
73c610e1d6
git: update to version 1.8.2
2013-03-22 02:11:38 +01:00
22fb1ad99e
Merge remote-tracking branch 'origin/master' into stdenv-updates.
2013-03-21 09:23:54 +01:00
d28d3f37a8
topgit: fix build on FreeBSD
...
The BSD unices have a version of install(1) that doesn't support the -D flag. Grr.
2013-03-20 11:43:43 +01:00
51e64392ea
git-annex: update to version 4.20130314
2013-03-20 10:15:06 +01:00
a1a7448e5b
topgit: update to version 0.9
2013-03-20 09:50:06 +01:00
d007a78ccb
Merge remote-tracking branch 'origin/stdenv-updates' into illumos
...
Conflicts:
pkgs/development/libraries/gmp/5.1.1.nix
pkgs/development/libraries/mpc/default.nix
pkgs/development/libraries/mpfr/default.nix
pkgs/development/libraries/ppl/default.nix
pkgs/tools/misc/coreutils/default.nix
2013-03-17 13:22:24 +01:00
23c78e41db
git: Adding -lgcc_s on darwin causes the build to fail, so we disable it for that platform
2013-03-14 14:57:40 +01:00
4c9ebb62d4
git: link binaries with libgcc_s.so to ensure pthread_cancel() works
2013-03-09 23:57:57 +01:00
4f697db7dd
haskell-github-backup: update to version 1.20120314
2013-03-02 17:07:43 +01:00
ecba7e947e
Update Git to 1.8.1.3 and fix build on Illumos.
2013-02-28 20:04:06 +01:00
329b33c59c
git-annex: clean up build expression
2013-02-28 13:04:15 +01:00
e23be1b2ef
git-annex: update to version 4.20130227
2013-02-28 11:31:44 +01:00
80dc8df25d
haskell-github-backup: update to version 1.20120314
2013-02-27 12:00:52 +01:00
8f1c029e33
haskell-github-backup: add version 1.20120627
2013-02-25 15:25:54 +01:00
8f1756e2d4
git: update to version 1.8.1.3
2013-02-25 02:12:42 +01:00
eb5ebb6063
network-protocol-xmpp: fix spelling of the attribute name
2013-02-22 16:14:27 +01:00
b076ab94d6
git-annex: update to version 3.20130216
2013-02-18 11:20:46 +01:00
8a9ba8c382
git: adding an option not to build the manual
...
asciidoc+xsltproc take hours to run
2013-01-28 21:24:52 +01:00
490085a811
git-annex: update to version 3.20130107
2013-01-09 16:54:31 +01:00
70b6b15215
git-annex: update to version 3.20130102
2013-01-04 19:24:09 +01:00
cb329d1cd2
git: update to version 1.8.1
2013-01-04 19:24:04 +01:00
918b26a59e
git-annex: update to version 3.20121211
2012-12-15 11:44:13 +01:00
f1c80cf20c
git-and-tools/hub: New package, version 1.10.3.
...
This is a small wrapper of Git, which integrates some GitHub specific features,
especially stuff like merging or sending pull requests or attaching commits to
an issue.
I'm not quite familiar with the Nix integration of Ruby, so let's hope that I'm
not doing something horrible here.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-12-12 12:36:18 +01:00
3261d1d4aa
git-annex: update to version 3.20121127
2012-12-03 16:12:04 +01:00
5553546c21
Remove a bunch of unreferenced files
...
Plus a small number of obsolete packages (like old versions of qemu).
2012-11-29 13:43:37 +01:00
8effc542b4
git-annex: update to 3.20121126
2012-11-27 13:46:27 +01:00
62f8d24e56
git: update to 1.8.0.1
2012-11-27 13:46:12 +01:00
03abf1abbc
git-annex: switch build to GHC 7.4.2
2012-11-21 17:40:56 +01:00
9ada368ef8
git-annex: update to version 3.20121112-161-gb27d9eb to fix build errors with current version of yesod
2012-11-21 12:30:54 +01:00
d999c3f6ec
tig: typo
2012-11-17 02:20:07 +01:00
a64b34a43e
tig: update to 1.1
2012-11-17 02:13:25 +01:00
84c6f6f88e
git-annex: update to version 3.20121112
2012-11-15 12:50:17 +01:00
4ab06e5c24
Fix git-annex build.
...
git-annex depends on 'testpack', which doesn't compile with Haskell
Platform 2012.4.0.0. The testpack library appears to be unmaintained, so
there is probably no quick solution for this issue. For the time being,
we compile git-annex with GHC 7.4.1.
2012-11-06 18:34:54 +01:00
6ac427d391
Update git-annex to 3.20121017
2012-11-05 13:59:08 +00:00
b963624867
update git to 1.8.0
2012-10-24 16:33:42 +02:00
58f3e47166
git: update to version 1.7.12.4
2012-10-19 10:08:07 +02:00
c90a15a604
git-annex: update to version 3.20121010
2012-10-15 20:17:33 +02:00
7dd3236c81
git: Update to 1.7.12.2
2012-10-02 12:34:38 -04:00
625e2e45f7
git: update to version 1.7.12.1
2012-09-24 13:28:31 +02:00
9ff9d85ef6
darcs-to-git: Remove propagatedBuildInputs.
...
I missed this while checking the commit diffs before my last push. And it really
doesn't make sense to propagate ruby all the way up to whatever in the universe
may depend on this package.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-09-17 06:35:49 +02:00
98b7228c06
darcs-to-git: New package from upstream Git.
...
This consists of just one single ruby script, which runs shell commands assuming
that the current PATH has all dependencies set up correctly. Unfortunately, this
somewhat breaks functional purity as the command won't work correctly in
environments that do not contain git, darcs or diffutils.
During the patchPhase we replace all those dependencies directly in the ruby
source code, rather than creating a wrapper. Afterwards we run a checkPhase
which not only checks whether we caught all the dependencies (PATH=) but also
checks if the conversion has been done correctly.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-09-17 06:08:04 +02:00
14da2bf31b
git: update to version 1.7.12
2012-09-06 18:13:45 +02:00
33bf9644cf
git-annex: update to version 3.20120825
2012-09-06 18:13:44 +02:00
b125ef36b6
Bump gitAndTools/tig from 0.16 to 1.0
2012-08-08 00:51:25 +02:00
f901b6d38d
git: Update to 1.7.11.4
2012-08-06 15:27:28 -04:00
3b0d9374a4
git-annex: update to 3.20120629
2012-06-29 21:09:52 +02:00
a97e27fc82
git-annex: update to 3.20120624
2012-06-29 21:09:52 +02:00
94812c9dd3
git: Fix the "notSupported" scripts for "git send-email" and "git gui"
2012-06-21 15:25:02 -04:00
9365981409
git: Updated to 1.7.11
2012-06-21 15:23:29 -04:00
a3224ededc
git-and-tools: fixed build in the presence of QuickCheck 2.5
...
svn path=/nixpkgs/trunk/; revision=34553
2012-06-18 18:16:23 +00:00
2a60c221d1
git-annex: updated to version 3.20120614
...
svn path=/nixpkgs/trunk/; revision=34518
2012-06-15 15:33:47 +00:00
330ea0887f
git-annex: added openssh to build inputs so that the configure phase enables support for SSH connection caching
...
svn path=/nixpkgs/trunk/; revision=34386
2012-06-08 14:02:28 +00:00
87d25896c1
git-annex: updated to version 3.20120605
...
svn path=/nixpkgs/trunk/; revision=34385
2012-06-08 14:02:21 +00:00
104bd01e1d
* Git 1.7.10.4.
...
svn path=/nixpkgs/trunk/; revision=34349
2012-06-04 15:54:57 +00:00
ac64ba04bd
git-annex: updated to version 3.20120522
...
svn path=/nixpkgs/trunk/; revision=34213
2012-05-22 19:46:37 +00:00
5e7f049fc9
* svn2git-kde 1.0.5.
...
svn path=/nixpkgs/trunk/; revision=34169
2012-05-18 15:01:54 +00:00
7c1612d6f2
* svn2git -> svn2git-kde to distinguish it from the other svn2git.
...
svn path=/nixpkgs/trunk/; revision=34071
2012-05-12 19:45:55 +00:00
e0bd67afd7
git-annex: updated to version 3.20120430
...
svn path=/nixpkgs/trunk/; revision=33970
2012-05-02 09:25:28 +00:00
4fc0e49bdd
git-annex: updated to version 3.20120418
...
svn path=/nixpkgs/trunk/; revision=33856
2012-04-20 11:35:20 +00:00
7a4cf21350
Add git-bz nix expression.
...
svn path=/nixpkgs/trunk/; revision=33801
2012-04-15 23:48:16 +00:00
7b7dd238fc
Add dulwich (git filesystem in python).
...
Add bugz (command line tool for bugzilla)
Add gitBz (bugzilla in git)
svn path=/nixpkgs/trunk/; revision=33800
2012-04-15 23:48:11 +00:00
4292793d40
git-annex: updated to version 3.20120406
...
svn path=/nixpkgs/trunk/; revision=33669
2012-04-08 10:48:14 +00:00
799722afde
git-annex: updated to version 3.20120405
...
svn path=/nixpkgs/trunk/; revision=33638
2012-04-05 23:11:00 +00:00
a1d87e58c1
re-add overwritten svn2git (used/developed by kde people)
...
svn path=/nixpkgs/trunk/; revision=33567
2012-04-04 15:30:29 +00:00
ebae9a9fd7
* Git 1.7.9.5.
...
svn path=/nixpkgs/trunk/; revision=33553
2012-04-03 11:07:50 +00:00
512357f875
* Remove a wildly outdated Git version that shouldn't have been in
...
Nixpkgs in the first place.
svn path=/nixpkgs/trunk/; revision=33272
2012-03-19 18:24:53 +00:00
46f9f71439
git: updated to version 1.7.9.4
...
svn path=/nixpkgs/trunk/; revision=33145
2012-03-16 09:47:34 +00:00
6ff954a5e8
git-annex: updated to version 3.20120315
...
svn path=/nixpkgs/trunk/; revision=33116
2012-03-15 18:07:49 +00:00
f5219b23a4
git-annex: updated to version 3.20120309
...
The test suite failure introduced recently has been fixed.
svn path=/nixpkgs/trunk/; revision=33014
2012-03-12 14:06:11 +00:00
3c56e571af
* Final sync with the trunk.
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=32820
2012-03-06 11:34:11 +00:00
88d14c0e29
git-annex: updated to version 3.20120230
...
Note that the latest version of git-annex must be compiled with GHC 7.4.1 or
later, because it takes advantage of some freaky file name encoding guessing
features that are absent in older versions of the base library.
svn path=/nixpkgs/trunk/; revision=32819
2012-03-06 11:24:20 +00:00
ea195b2507
svn merge ^/nixpkgs/trunk
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=32564
2012-02-25 19:57:34 +00:00
0660134750
git: updated to version 1.7.9.2
...
svn path=/nixpkgs/trunk/; revision=32528
2012-02-23 22:31:09 +00:00
e64443baf1
* Sync with the trunk.
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=32468
2012-02-21 23:29:21 +00:00
45fed14272
* Revert r32435. We'll be doing a stdenv merge in a few days, so
...
let's put it in there rather than having the Nth near-complete
rebuild of the trunk in a few days.
svn path=/nixpkgs/trunk/; revision=32436
2012-02-20 18:59:43 +00:00
5144a19987
svn merge ^/nixpkgs/trunk
...
There were a few merge conflicts due to ensureDir->mkdir -p migration
svn path=/nixpkgs/branches/stdenv-updates/; revision=32174
2012-02-10 10:24:30 +00:00
e4ee3e2c9b
* svn2git updated to 2.2.0.
...
svn path=/nixpkgs/trunk/; revision=32108
2012-02-07 12:22:48 +00:00
5b132f6e96
svn merge ^/nixpkgs/trunk
...
Conflicts: cups, all-packages.nix (gcc45_debug)
svn path=/nixpkgs/branches/stdenv-updates/; revision=31863
2012-01-26 15:27:03 +00:00
6e4f0b6365
git-annex: updated to version 3.20120123
...
svn path=/nixpkgs/trunk/; revision=31836
2012-01-25 16:07:52 +00:00
f8eee42a66
git-annex: updated to version 3.20120116
...
svn path=/nixpkgs/trunk/; revision=31757
2012-01-21 14:32:42 +00:00
c556a6ea46
* "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless
...
function, so obsolete it.
svn path=/nixpkgs/branches/stdenv-updates/; revision=31644
2012-01-18 20:16:00 +00:00
7ccde05271
git-annex: cosmetic change for the meta.license attribute
...
svn path=/nixpkgs/trunk/; revision=31572
2012-01-15 11:44:08 +00:00
97e815a9af
git-annex: bumped to version 3.20120113
...
svn path=/nixpkgs/trunk/; revision=31569
2012-01-15 11:43:57 +00:00
bae5b8dabb
git-annex: updated to version 3.20120106
...
svn path=/nixpkgs/trunk/; revision=31509
2012-01-13 09:27:08 +00:00
38f6d36e91
git-annex: updated to version 3.20111231
...
svn path=/nixpkgs/trunk/; revision=31212
2012-01-02 14:51:26 +00:00
1817b55a7f
git: updated to version 1.7.8
...
svn path=/nixpkgs/trunk/; revision=30805
2011-12-09 11:44:42 +00:00
acd7288678
* Proper version number.
...
svn path=/nixpkgs/trunk/; revision=30784
2011-12-06 21:16:20 +00:00
3aedd3770f
* Get svn2git to work.
...
svn path=/nixpkgs/trunk/; revision=30778
2011-12-06 15:41:16 +00:00
3357437461
git-annex: updated to version 3.20111203
...
svn path=/nixpkgs/trunk/; revision=30762
2011-12-05 16:23:05 +00:00
42757e653a
Temporarily keep monad-control 0.2.0.3 until a new version of git-annex comes out that supports the current version.
...
svn path=/nixpkgs/trunk/; revision=30761
2011-12-05 16:23:02 +00:00
1193eabfa1
git-annex: updated to version 3.20111122
...
svn path=/nixpkgs/trunk/; revision=30538
2011-11-23 09:21:20 +00:00
1c0ae7e8ed
git: updated to version 1.7.7.3
...
svn path=/nixpkgs/trunk/; revision=30476
2011-11-18 18:37:20 +00:00
9dcb5da174
git-annex: updated to version 3.20111107
...
svn path=/nixpkgs/trunk/; revision=30337
2011-11-08 16:59:30 +00:00
a0cf7c24e1
git-annex: updated to version 3.20111025
...
svn path=/nixpkgs/trunk/; revision=30241
2011-11-05 00:03:44 +00:00
87bf637319
Mercurial: Give access to ssl and curses python packages for
...
fast-export and crecord.
svn path=/nixpkgs/trunk/; revision=29972
2011-10-22 15:41:20 +00:00
9016346fbd
git: updated to version 1.7.7
...
svn path=/nixpkgs/trunk/; revision=29965
2011-10-21 16:50:36 +00:00
e98852cefd
git-annex: updated to version 3.20111011
...
svn path=/nixpkgs/trunk/; revision=29964
2011-10-21 16:34:38 +00:00
19769280f6
git-subtree: updated to version 0.4-2-g2793ee6
...
svn path=/nixpkgs/trunk/; revision=29333
2011-09-18 14:56:46 +00:00
7b8f4ec540
git-annex: updated to version 3.20110915
...
svn path=/nixpkgs/trunk/; revision=29331
2011-09-18 08:28:29 +00:00
8d0794f5e2
stgit: disable the test suite for the time being
...
There are failures, but it's unclear whether those are caused by assumptions
about the build environment or whether they signify real problems in the
software.
svn path=/nixpkgs/trunk/; revision=29295
2011-09-15 12:47:49 +00:00
cd3e9099e9
stgit: updated to version 0.15
...
svn path=/nixpkgs/trunk/; revision=29294
2011-09-15 11:04:00 +00:00
fcec1593b8
git doesn't need subversion server
...
svn path=/nixpkgs/trunk/; revision=29102
2011-09-07 22:52:52 +00:00
2c0eddaeaa
git-annex: updated to version 3.20110902
...
svn path=/nixpkgs/trunk/; revision=28996
2011-09-03 13:17:36 +00:00
c0fb177ce9
git-annex: pass an older version of QuickCheck to fix build failure of the test suite
...
svn path=/nixpkgs/trunk/; revision=28829
2011-08-26 10:51:47 +00:00
1972e6f6dc
git-annex: updated to version 3.20110819
...
svn path=/nixpkgs/trunk/; revision=28771
2011-08-23 08:52:06 +00:00
1c79ecc5af
git2cl: added meta data for the package and updated the build to take
...
advantage of stdenv features such as automatic updating of the shebang
path to perl, etc.
svn path=/nixpkgs/trunk/; revision=28768
2011-08-23 08:44:59 +00:00
19b376cc41
git-subtree: 0.3 -> 0.4
...
svn path=/nixpkgs/trunk/; revision=28760
2011-08-22 20:26:15 +00:00
c13f967ed5
Replaced the obsolete 'haskellPlatforms' attribute with the platforms exported by GHC.
...
svn path=/nixpkgs/trunk/; revision=28418
2011-08-09 09:54:50 +00:00
efe5ab73b1
git: fixed impure path to perl in git-am and git-submodule
...
svn path=/nixpkgs/trunk/; revision=27859
2011-07-20 22:56:31 +00:00
ff91dbdb35
git-annex: the latest version depends on the monad-control package
...
svn path=/nixpkgs/trunk/; revision=27839
2011-07-20 12:13:07 +00:00
f61f66f46d
git-annex: updated to version 3.20110719
...
svn path=/nixpkgs/trunk/; revision=27836
2011-07-20 10:16:35 +00:00
ffe01e880d
git-annex: build only on platforms that support Haskell
...
svn path=/nixpkgs/trunk/; revision=27792
2011-07-14 21:54:53 +00:00
68957344fa
git-annex: updated to version 3.20110707
...
svn path=/nixpkgs/trunk/; revision=27775
2011-07-14 12:22:26 +00:00
4e5cc9b965
git: removed 'lowPri' wrapper around gitFull
...
Packages that need git as build-time or run-time dependency typically refer to
the attribute 'git', which is the expression with the least possible set of
features.
Users, however, who run "nix-env -i git", don't want that version, because it
lacks support for SVN, for sending e-mail, and it doesn't include the GUI. In
other words, users want gitFull by default, which is what this change
accomplishes.
svn path=/nixpkgs/trunk/; revision=27748
2011-07-13 10:46:17 +00:00
9edc2574dd
git-annex: the build system uses 'which' to determine whether ikiwiki is installed
...
svn path=/nixpkgs/trunk/; revision=27747
2011-07-13 10:41:10 +00:00
e4353b1f65
git: install contrib code included in the distribution
...
TODO: byte-compile emacs modules
svn path=/nixpkgs/trunk/; revision=27665
2011-07-07 23:48:38 +00:00
2fee0ecef9
git: updated to version 1.7.6
...
svn path=/nixpkgs/trunk/; revision=27664
2011-07-07 23:48:34 +00:00
21373bc49b
git-annex: enable the documentation build
...
svn path=/nixpkgs/trunk/; revision=27663
2011-07-07 23:48:30 +00:00
39f2346b1b
git-annex: cosmetic changes in the meta section
...
svn path=/nixpkgs/trunk/; revision=27662
2011-07-07 23:48:26 +00:00
0ec6325b87
git-annex: updated to version 3.20110705
...
svn path=/nixpkgs/trunk/; revision=27661
2011-07-07 23:48:22 +00:00
7a7581d220
left over commit
...
svn path=/nixpkgs/trunk/; revision=27197
2011-05-09 14:59:58 +00:00
9b4e1f6f53
git: updated to version 1.7.5.1
...
svn path=/nixpkgs/trunk/; revision=27169
2011-05-06 07:35:06 +00:00
e88567a0db
git-annex: added missing dataenc dependency
...
svn path=/nixpkgs/trunk/; revision=27144
2011-05-04 13:21:26 +00:00
2ff77d4134
fixed hash
...
svn path=/nixpkgs/trunk/; revision=27137
2011-05-04 10:14:02 +00:00
c34fdd226e
oops, wrote git2svn in stead of svn2git
...
svn path=/nixpkgs/trunk/; revision=27136
2011-05-04 10:11:30 +00:00
02b871de50
add svn2git
...
svn path=/nixpkgs/trunk/; revision=27135
2011-05-04 10:07:56 +00:00
59dae8edf4
git-annex: added missing SHA dependency
...
svn path=/nixpkgs/trunk/; revision=27131
2011-05-04 09:45:22 +00:00
fb10d3399d
git-annex: updated to version 0.20110427
...
The most current one is 0.20110503, but the corresponding tarball isn't
available for download yet.
svn path=/nixpkgs/trunk/; revision=27130
2011-05-04 09:26:45 +00:00
1ca832be87
git-and-tools: dropped support for getConfig -- use override instead!
...
See my earlier commit that dropped getConfig support from subversion.
svn path=/nixpkgs/trunk/; revision=26829
2011-04-13 17:53:39 +00:00
864a75d725
gitFull: modify the name of the expression to make it distinct
...
This also means adding a lowPrio wrapper, because without it nix-env
would prefer the "-full" expression over the normal one.
Maybe that's desirable, even?
svn path=/nixpkgs/trunk/; revision=26828
2011-04-13 17:53:33 +00:00
60974e9e87
all-packages.nix: added low-priority 'gitSVN' expression, a variant of git with SVN support (but no GUI)
...
svn path=/nixpkgs/trunk/; revision=26827
2011-04-13 17:53:26 +00:00
ec23e33d0c
applications/version-management/git-and-tools/default.nix: cosmetic
...
svn path=/nixpkgs/trunk/; revision=26826
2011-04-13 17:53:20 +00:00
3f609d2e35
git-annex: updated to version 0.20110401
...
svn path=/nixpkgs/trunk/; revision=26739
2011-04-07 12:47:17 +00:00
165f8efdfd
git: updated to version 1.7.4.4
...
svn path=/nixpkgs/trunk/; revision=26738
2011-04-07 12:46:58 +00:00
32fea0d8b1
Cosmetic, no functional change intended.
...
svn path=/nixpkgs/trunk/; revision=26477
2011-03-23 21:05:08 +00:00
4e6bc23b70
git-annex: patch unpure /usr/bin/perl path in mdwn2man script
...
svn path=/nixpkgs/trunk/; revision=26476
2011-03-23 21:05:01 +00:00
fd81655bfb
topgit: avoid use of "install -D", which doesn't work on FreeBSD
...
svn path=/nixpkgs/trunk/; revision=26475
2011-03-23 20:32:12 +00:00
789f14c0b7
git-annex: added initial version 0.20110320
...
svn path=/nixpkgs/trunk/; revision=26470
2011-03-23 15:57:53 +00:00
07d14b9997
Cosmetic, no functional change intended.
...
svn path=/nixpkgs/trunk/; revision=26464
2011-03-23 10:24:26 +00:00
3f7ea10694
topgit: updated to version 0.8-45-gd279e29
...
svn path=/nixpkgs/trunk/; revision=26463
2011-03-23 10:24:22 +00:00
ecf72a5720
git: 1.7.4 -> 1.7.4.1
...
svn path=/nixpkgs/trunk/; revision=26107
2011-02-24 22:19:37 +00:00
4262167be0
pkgs/applications/version-management/git-and-tools/git: fixed git gui module
...
Patch Tcl/Tk scripts to invoke 'wish' using the complete executable path to
ensure that the proper version is being used.
svn path=/nixpkgs/trunk/; revision=25755
2011-02-02 11:16:57 +00:00
b67c47cb3f
git: 1.7.3.5 -> 1.7.4
...
svn path=/nixpkgs/trunk/; revision=25732
2011-01-31 09:42:37 +00:00
e6e6f033ec
pkgs/applications/version-management/git-and-tools/git: cosmetic changes to improve consistency
...
No functional change is intended.
svn path=/nixpkgs/trunk/; revision=25456
2011-01-07 11:04:09 +00:00
d0f409e009
pkgs/applications/version-management/git-and-tools/git: be verbose when creating symlinks
...
The postInstall hook replaces identical copies of the same files in $out with
symlinks. This patch changes the call to 'ln' to pass the '-v' flag so that we
can see in the build log which files were replaced.
svn path=/nixpkgs/trunk/; revision=25455
2011-01-07 11:04:04 +00:00
f989b670d6
pkgs/applications/version-management/git-and-tools/git: fixed the build to deal with names that contain whitespace
...
The "find -print | while read" loop failed to deal with paths that contain
whitespace. Instead, we now use a similar construct that's based on globbing.
svn path=/nixpkgs/trunk/; revision=25454
2011-01-07 11:03:57 +00:00
167f185411
pkgs/applications/version-management/git-and-tools/git: fixed "git gui"
...
The git-gui module cannot be wrapped like gitk, because the Tcl implementation
uses the program's basename to determine stuff like the name of the Window it
opens, etc., and it cannot deal with a program name that contain a dot, like
".git-gui-wrapped" did.
Instead of wrapping git-gui, it's now patched to execute 'wish' with a complete
store path.
While I was at it, I also applied this solution to git-gui--askpass.
svn path=/nixpkgs/trunk/; revision=25453
2011-01-07 11:03:42 +00:00
922bb7657c
pkgs/applications/version-management/git-and-tools/git: updated to version 1.7.3.5
...
svn path=/nixpkgs/trunk/; revision=25435
2011-01-06 10:04:21 +00:00
4c16325de0
I take out getPkgConfig. It looks to me as if it needed a solution, but noone took action.
...
I take action before much discussion.
For what I see:
- getPkgConfig problems are hard to track
- config.nix trying to forecast getPkgConfig behaviour looks me as a bad approach,
and people should not trust such a config.nix unless they parsed the whole nixpkgs
for tricky effects.
- It's not that hard to write config.nix in the style of getConfig
- Every now and then newcomers hit the "'git' is an attribute set while a boolean was expected".
Maybe this will disrupt nixes of some people, and that will be a background on what to discuss.
svn path=/nixpkgs/trunk/; revision=25314
2010-12-28 21:07:35 +00:00
5b009db20e
Updated Git to version 1.7.3.2.
...
svn path=/nixpkgs/trunk/; revision=24600
2010-11-05 11:45:16 +00:00
2cc3847cd4
pkgs/applications/version-management/git-and-tools: updated topgit to version 0.8-32-g8b0f1f9
...
svn path=/nixpkgs/trunk/; revision=24487
2010-10-26 12:08:49 +00:00
c7756e473b
pkgs/applications/version-management/git-and-tools: prefer fetchurl over fetchgit in topGit
...
svn path=/nixpkgs/trunk/; revision=24442
2010-10-23 22:39:53 +00:00
4bdf53b0f1
pkgs/applications/version-management/git-and-tools: updated topgit to version 0.8-19-g9404aa1
...
svn path=/nixpkgs/trunk/; revision=23996
2010-09-30 13:27:24 +00:00
ff1a93282f
pkgs/applications/version-management/git-and-tools/git: updated to version 1.7.3.1
...
svn path=/nixpkgs/trunk/; revision=23995
2010-09-30 13:27:17 +00:00
8ec9590737
Git: fix an impurity: was taking grep from PATH.
...
svn path=/nixpkgs/trunk/; revision=23853
2010-09-18 12:45:04 +00:00
139de1ea2f
Don't try to build Qt guis if qt is unsupported on the platform
...
svn path=/nixpkgs/trunk/; revision=23812
2010-09-15 18:52:07 +00:00
9b8a491a73
pkgs/applications/version-management/git-and-tools/git: updated to version 1.7.2.3
...
svn path=/nixpkgs/trunk/; revision=23695
2010-09-09 16:06:26 +00:00
919ae70e01
Make hydra compile QGit
...
svn path=/nixpkgs/trunk/; revision=23662
2010-09-07 09:54:11 +00:00
2ab5f25607
Updating 'tig' (for garbas@freenode)
...
svn path=/nixpkgs/trunk/; revision=23487
2010-08-28 14:10:49 +00:00
1a6039cb45
Enable parallel building of gcc, glibc, gmp, mpfr, ncurses, coreutils, perl, python, git, and qt4.
...
If a build expressions has set "enableParallelBuilding = true", then the
generic builder may utilize more than one CPU core to build that particular
expression. This feature works out of the box for GNU Make. Expressions that
use other build drivers like Boost.Jam or SCons have to specify appropriate
flags such as "-j${NIX_BUILD_CORES}" themselves.
svn path=/nixpkgs/trunk/; revision=23042
2010-08-08 18:51:42 +00:00
dbef94575c
pkgs/applications/version-management/git-and-tools/git: updated to version 1.7.2.1
...
svn path=/nixpkgs/trunk/; revision=22960
2010-08-05 11:25:02 +00:00
932899f3da
Tk version number is now 8.5 but at several places TK_LIBRARY is set "${tk}/lib/tk8.4". As for Python, tk.libPrefix is introduced to match "tk8.5".
...
contributed by David Guibert
Signed-off-by: David Guibert <david.guibert@gmail.com>
svn path=/nixpkgs/trunk/; revision=22041
2010-05-28 10:57:50 +00:00
5e4bf97212
pkgs/applications/version-management/git-and-tools: disable sendEmailSupport on Darwin in gitFull
...
The required perl libraries don't build on Darwin.
svn path=/nixpkgs/trunk/; revision=21872
2010-05-19 12:26:17 +00:00
1fc724cc5c
pkgs/applications/version-management/git-and-tools/git: build git on all platforms, not just Linux
...
svn path=/nixpkgs/trunk/; revision=21839
2010-05-18 14:41:18 +00:00
Alex Dunn
Tim Steinbach
Jascha Geerds
Frederik Rietdijk
Vladimír Čunát
zimbatm
Eelco Dolstra
dipinhora
Christine Koppelt
Michael Fellinger
Damien Cassou
Kamil Chmielewski
Peter Simons
Aaron Bull Schaefer
J Phani Mahesh
Gabriel Ebner
mimadrid
obadz
Silvio Fricke
Franz Pletz
Robin Gloster
Tuomas Tynkkynen
Bjørn Forsman
Alexey Lebedeff
Nathan Zadoks
Kazunori Kajihiro
Rok Garbas
Domen Kožar
Andrey Pavlov
Ricardo Ardissone
Tobias Geerinckx-Rice
Nikolay Amiantov
Bob van der Linden
Louis Taylor
Yann Hodique
Graham Christensen
Benjamin Staffin
Wout Mertens
koral
Guillaume Maudoux
Christoph Hrdinka
Tobias Geerinckx-Rice
somaticweb
janus
Matt McHenry
Eric Merritt
Igor Pashev
Luca Bruno
Jude Taylor
William A. Kennington III
Stéphane Jourdois
Desmond O. Chang
Eelco Dolstra
Matthias Beyer
Mathnerd314
Austin Seipp
Jascha Geerds
Joachim Fasting
Joachim Schiele
William Giokas
John Wiegley
Spencer Whitt
lethalman
Dan Peebles
Charles Strahan
muflax
Robert Helgesson
Ludovic Courtès
aszlig
Arseniy Seroka
Kirill Elagin
Tom
Maciek Starzyk
Vladimir Kirillov
Mateusz Kowalczyk
Linquize
Ellis Whitehead
Dmitry Malikov
Moritz Ulrich
Rüdiger Sonderfeld
Georges Dubus
Paul Woolcock
Shea Levy
Evgeny Egorochkin
Ricardo M. Correia
Nixpkgs Monitor
Mathijs Kwik
Jaka Hudoklin
Gergely Risko
Danny Wilson
Sander van der Burg
Lluís Batlle i Rossell
Paolo Capriotti
David Guibert
Dmitry Malikov
Nicolas Pierron
Rob Vermaas
Yury G. Kudryashov
Lluís Batlle i Rossell
Evgeny Egorochkin
Marc Weber