Commit graph

1224 commits

Author SHA1 Message Date
Jude Taylor
ec09587e5b build mercurial with cf-private 2015-10-11 10:30:13 -07:00
Eelco Dolstra
741bf840da Revert "Merge pull request #9543 from NixOS/staging.post-15.06"
This reverts commit f61176c539, reversing
changes made to a27ca029ee.

Conflicts:
	pkgs/development/libraries/ncurses/default.nix
2015-10-06 15:24:20 +02:00
Tobias Geerinckx-Rice
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
Vladimír Čunát
e9fcbe67b0 kde4.kdesdk-kioslaves: fix by resurrecting svn-1.8
Just bringing back pre-bc54ecd811e state as well.
2015-10-01 22:23:31 +02:00
Matthias Beyer
05fab76355 gitAndTools.git-extras: 2.2.0 -> 3.0.0 2015-09-29 12:27:22 +02:00
Thomas Tuegel
2e0589b4ca kde414: build with kdelibs-4.14.12
Upstream changes to the build system required adjusting many packages'
dependencies. On the Nixpkgs side, we no longer propagate the dependency
on cmake (to reduce closure size), so downstream dependencies had to be
adjusted for most packages that depend on kdelibs.
2015-09-27 15:08:12 -05:00
Robert Scott
f96582fc60 mercurial: add package for crecord extension as optional dependency, include by default in mercurialFull 2015-09-24 10:59:14 +00:00
Raymond Gauthier
738acf0651 smartgithg: 7.0.0 -> 7.0.2
Also adapted package's freedesktop item install
script so that it works in the context of nix.
(i.e.: icons and `*.desktop` file now properly
installed by the package).
2015-09-23 22:40:03 -04:00
William A. Kennington III
a7b55bc324 subversion: 1.9.1 -> 1.9.2 2015-09-23 12:30:00 -07:00
William A. Kennington III
25dbb2d8bc git: 2.5.2 -> 2.5.3 2015-09-23 12:30:00 -07:00
Vladimír Čunát
76ef7a93e3 Merge: xlibs and x11 attribute cleanup
Frequently using multiple *almost* identical attributes is bad.
2015-09-23 10:42:34 +02:00
Bjørn Forsman
452ebd1987 gitinspector: init at 0.4.1 2015-09-22 16:35:44 +02:00
Peter Simons
07f8f50c6d git-annex: build w/o assistant in Stackage, with assistant for Nixpkgs 2015-09-19 08:20:54 +02:00
William A. Kennington III
bc54ecd811 subversion: 1.8.14 -> 1.9.1 2015-09-17 14:12:38 -07:00
Arseniy Seroka
e8c1717ff4 Merge pull request #9895 from Mathnerd314/rabbitvcs
rabbitvcs: init at 0.16
2015-09-17 18:05:58 +03:00
Mathnerd314
c3ed1b17ba rabbitvcs: init at 0.16 2015-09-16 16:36:27 -06:00
Edward Tjörnhammar
f02eed27f9 gitRepo: 1.21 -> 1.22 2015-09-16 19:13:27 +02:00
Vladimír Čunát
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
Mathnerd314
eb7404d97a all-packages: Use callPackage where possible 2015-09-14 22:27:19 -06:00
William A. Kennington III
b127f88711 git: 2.5.1 -> 2.5.2 2015-09-13 20:09:19 -07:00
Kamil Chmielewski
e77b9fff67 git-radar: init at 0.3.2 2015-09-08 08:44:51 +02:00
Rok Garbas
b2579497c6 smartgithg: 6.5.9 -> 7.0.0 2015-09-04 09:04:56 +02:00
koral
944a0c82f0 mercurial: 3.5 -> 3.5.1, fixes #9615 2015-09-04 09:04:48 +02:00
koral
0c15deaeb6 mercurial: 3.4.2 -> 3.5 2015-09-04 09:03:59 +02:00
Domen Kožar
6cb878e9c2 redmine: shorten flags line to avoid yaml parsing bug
(cherry picked from commit c56f25d06fcd1eb4b0b232296a055b2dce997a05)
Signed-off-by: Domen Kožar <domen@dev.si>
2015-09-03 10:11:41 +02:00
William A. Kennington III
6f19418b65 git: 2.5.0 -> 2.5.1 2015-08-31 10:27:07 -07:00
Daniel Fox Franke
07903b1617 cvs-fast-export: don't link against librt
It's superfluous on Linux, and it breaks the build on Darwin.
2015-08-29 12:05:52 -04:00
Daniel Fox Franke
0912bdfa92 cvs-fast-export: patch shebangs in source tree
This allows unit tests to run successfully in chroot build
environments, which lack /usr/bin/env.
2015-08-26 15:18:06 -04:00
Daniel Fox Franke
686fec3ce7 reposurgeon: init at 3.28 2015-08-25 22:06:07 -04:00
Daniel Fox Franke
2194295fff cvs-fast-export: init at 1.32 2015-08-25 22:06:06 -04:00
Eelco Dolstra
24f1a7a5cb subversion: Update to 1.8.14
CVE-2015-3184, CVE-2015-3187.
2015-08-24 11:51:28 +02:00
Shea Levy
b661ebe3cb rcs: Use c99 on darwin 2015-08-20 08:10:27 -04:00
Tobias Geerinckx-Rice
481d2acea8 git-hub: remove files not needed on Nix 2015-08-17 23:21:50 +02:00
Desmond O. Chang
f3cb701085 git-crypt: init at 0.5.0 2015-08-08 17:04:07 +08:00
vbgl
4d22b539b8 Merge pull request #9070 from danbst/tortoise-hg
new package: TortoiseHg and dependencies
2015-08-06 12:55:56 +02:00
Eelco Dolstra
525c901ce9 Make svn2git visible to nix-env 2015-08-05 14:33:12 +02:00
Eelco Dolstra
9657be0b95 svn2git-kde: Mark as broken
The source repository no longer exists.
2015-08-05 14:33:03 +02:00
Marco Maggesi
ba3a4a892e Update fossil to version 1.33 2015-08-05 14:09:33 +02:00
danbst
40061f66ce mercurial: bump 3.3.3 -> 3.4.2 2015-07-31 20:18:20 +00:00
danbst
fc155f74d6 tortoisehg: init at 3.4.2 2015-07-31 19:29:29 +00:00
Eelco Dolstra
55932c1bec Don't statically depend on cacert for certificates
This reverts commit cd52c04456 and
others.

Managing certificates (including revoking certificates and adding
custom certificates) becomes extremely painful if every package in the
system potentially depends on a different copy of cacert. Also, it
makes updating cacert rather expensive.
2015-07-31 01:34:58 +02:00
William A. Kennington III
0e947e00a0 git: 2.4.6 -> 2.5.0 2015-07-29 18:15:08 -07:00
Mateusz Kowalczyk
77857a8237 Merge pull request #7599 from jraygauthier/jrg/add_peru_pkg
Added peru package.
2015-07-26 17:27:02 +01:00
Raymond Gauthier
cdc58d410b peru: init at 0.2.3
A project dependencies version management system
built on top of multiple version management systems.
2015-07-26 09:57:51 -04:00
Vincent Laporte
9d5508d85c meld: 3.12.3 -> 3.14.0 (close #8982) 2015-07-25 13:10:24 +02:00
Vladimír Čunát
9f37e91ec5 Merge master into staging
There are larger-rebuild changes: gnutls and samba.
2015-07-17 06:38:04 +02:00
William A. Kennington III
d7b917e612 git: 2.4.5 -> 2.4.6 2015-07-16 20:07:17 -07:00
lostdj
a643e25286 SmartGitHg: 6.5.7 -> 6.5.9 2015-07-15 13:13:01 +03:00
William A. Kennington III
333f145d76 Merge branch 'master.upstream' into staging.upstream 2015-07-13 15:11:31 -07:00
Austin Seipp
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
Austin Seipp
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
William A. Kennington III
dae5b35463 ruby: Fixup libv8 versions 2015-07-08 15:10:50 -07:00
Jude Taylor
6f6d873069 darwin purity: mercurial 2015-07-08 14:15:04 -07:00
William A. Kennington III
d605663ae2 Merge branch 'master.upstream' into staging.upstream 2015-07-05 13:06:02 -07:00
Pascal Wittmann
b6db9b9553 src: update from 0.13 to 0.19 2015-07-01 23:43:17 +02:00
William A. Kennington III
7eae48871f Merge branch 'master.upstream' into staging.upstream 2015-07-01 13:38:17 -07:00
Shea Levy
145768bf9b Unmaintain a bunch of packages 2015-07-01 08:11:05 -04:00
lethalman
d50969b66e Merge pull request #8580 from jraygauthier/jrg/fix_meld_hicolor_icon_breakage
Fix meld package that broke the hicolor icon theme.
2015-07-01 10:12:32 +02:00
Raymond Gauthier
d612a9e132 meld: fix for hicolor theme breakage
This breakage was cause by the package outputing its own
version of index.cache to `share/icons/hicolor`.

Used the `hicolor_icon_theme` hook to perform automated cleanup.
2015-07-01 00:26:02 -04:00
William A. Kennington III
ef253212f4 Merge branch 'master.upstream' into staging.upstream 2015-06-26 17:25:49 -07:00
Pascal Wittmann
dd73d2af87 Merge pull request #8505 from joachifm/delete-codeville
codeville: delete expression
2015-06-26 17:09:42 +02:00
Jude Taylor
9f6f299448 darwin purity: subversion 2015-06-25 16:36:05 -07:00
Jude Taylor
a8c98bc013 darwin purity: mercurial 2015-06-25 16:36:04 -07:00
Joachim Fasting
78d4f1dec6 codeville: delete expression
Codeville is abandonware. The homepage returns 404, and the last release
is 8 years old ...
2015-06-25 22:34:29 +02:00
Thomas Tuegel
a8c52d0958 Merge branch 'master' into staging 2015-06-25 09:15:05 -05:00
Peter Simons
922c555015 mercurial: add hg-git support
Enable this feature by putting these lines into your ~/.hgrc file:

  [extensions]
  hgext.bookmarks =
  hggit =
2015-06-24 11:33:17 +02:00
William A. Kennington III
282d03befa Merge branch 'master.upstream' into staging.upstream 2015-06-22 10:57:36 -07:00
Jascha Geerds
01e43fcd1d gitflow: 1.7.0 -> 1.8.0 2015-06-22 12:17:50 +02:00
Jascha Geerds
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
Jascha Geerds
3f66bb7ff2 Add myself as maintainer 2015-06-22 08:26:09 +02:00
Bob van der Linden
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
William A. Kennington III
fe4f8903b4 Merge branch 'master.upstream' into staging.upstream 2015-06-18 22:37:00 -07:00
William A. Kennington III
7fd80890c7 git: 2.4.2 -> 2.4.4 2015-06-18 21:24:46 -07:00
Luca Bruno
aa800fa0fe Merge branch 'master' into staging 2015-06-15 09:56:29 +02:00
Henry Till
faa90fad3f mr: update from 1.20141024 to 1.20150503 2015-06-14 22:54:31 +02:00
William A. Kennington III
954801a9a8 Merge branch 'master.upstream' into staging.upstream 2015-06-12 13:47:46 -07:00
Peter Simons
84dfce0bc0 mercurial: install bash completion 2015-06-11 12:07:15 +02:00
Eelco Dolstra
4a57b07653 Merge remote-tracking branch 'origin/master' into staging 2015-06-11 00:18:24 +02:00
Peter Simons
59d98da246 Merge pull request #8273 from k0ral/git
git: 2.4.1 -> 2.4.2
2015-06-10 21:40:13 +02:00
koral
5a64cc1dc8 git: 2.4.1 -> 2.4.2 2015-06-10 16:22:23 +00:00
William A. Kennington III
9d6555dc0a Merge branch 'master.upstream' into staging.upstream 2015-06-06 12:04:42 -07:00
William A. Kennington III
ffd0539eba cacert: store ca-bundle.crt in $out/etc/ssl/certs instead of $out 2015-06-05 13:00:52 -07:00
Tobias Geerinckx-Rice
1a64d9251c Add git-hub: command line GitHub interface
Rather cool, actually.
2015-06-02 23:58:03 +02:00
Domen Kožar
dc3316268e Merge branch 'master' into staging 2015-06-01 11:00:51 +02:00
William A. Kennington III
867d2c5c46 openssl: Remove References to OPENSSL_X509_CERT_FILE 2015-05-31 15:50:51 -07:00
Peter Simons
b462c7908f git-annex: on second thought, let's not break backwards compatibility for no apparent reason 2015-05-30 21:02:45 +02:00
Peter Simons
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
William A. Kennington III
cd52c04456 Fix more ca-bundle paths 2015-05-29 14:26:32 -07:00
William A. Kennington III
14c1e0fa1f Fix ca-bundle paths 2015-05-29 14:03:34 -07:00
Tobias Geerinckx-Rice
158e1cfdd0 Don't use "with licenses;" for single licences
And don't use square brackets on such lines.
2015-05-28 19:20:29 +02:00
Austin Seipp
d7de6dad5f Merge pull request #7755 from Lassulus/gitolite-update
Gitolite update
2015-05-25 10:02:56 -05:00
William A. Kennington III
21247699ad git: 2.4.0 -> 2.4.1 2015-05-15 18:38:13 -07:00
Pascal Wittmann
9c9c586534 Fixed several "package has no version" warnings 2015-05-14 17:19:41 +02:00
lassulus
23b97e4066 gitolite: v3.6.2 -> v3.6.3 2015-05-10 14:07:47 +02:00
koral
d40cf483cc git: 2.3.6 -> 2.4.0 2015-05-09 11:46:31 +00:00
Bob van der Linden
9254ee082e git-cola: changed platform to Linux only 2015-05-08 13:41:02 +02:00
Peter Simons
324719a5a6 Drop obsolete pre-NG Haskell builds. 2015-05-05 21:44:47 +02:00
Pascal Wittmann
9dcac56f34 bzrTools: update from 2.5 to 2.6 and refactor 2015-05-03 00:02:04 +02:00
Domen Kožar
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
Joachim Fasting
bf7ad2d84f meta.description fixups
Mostly scripted substitutions with a couple of subjective enhancements.
2015-04-30 18:17:42 +02:00
Jascha Geerds
2efbbaaa86 Merge pull request #7595 from jraygauthier/jrg/smartgit_657
Updated smartgithg to version `6.5.7`.
2015-04-30 01:28:21 +02:00
Raymond Gauthier
cc1b3a7d8a Fixed issue with smartgithg download url prefix.
Was using the `download` infix instead of
`downloads`.
2015-04-29 19:11:16 -04:00
Joachim Schiele
50fb7b312b tig-2.1.1: version bump 2015-04-29 23:57:31 +02:00
William Giokas
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
Raymond Gauthier
ce43dae0df Updated smartgithg to version 6.5.7. 2015-04-27 22:00:42 -04:00
John Wiegley
de808ae79f Merge pull request #7276 from spwhitt/git-imerge
git-imerge: new package
2015-04-26 19:51:05 -05:00
koral
ffe6539c98 git: 2.3.5 -> 2.3.6 2015-04-25 23:07:02 +00:00
Peter Simons
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
Andrey Pavlov
d421a7b77b git-and-tools/hub: 2.2.0-rc1 -> 2.2.1 2015-04-16 10:25:25 +03:00
Spencer Whitt
943fd93c14 git-imerge: new package 2015-04-14 15:50:27 -04:00
Eelco Dolstra
c98b8f4c11 subversion: Update to 1.8.13 2015-04-09 15:35:27 +02:00
John Wiegley
aec35dfa58 Revert "git-imerge: new package"
This reverts commit 309d0f0c8b.
2015-04-08 14:03:14 -05:00
Spencer Whitt
309d0f0c8b git-imerge: new package 2015-04-07 00:40:33 -04:00
Arseniy Seroka
a4ab883ab9 Merge pull request #7144 from k0ral/mercurial
mercurial: 3.3.2 -> 3.3.3
2015-04-03 16:15:07 +03:00
Peter Simons
844d88fe4c Merge pull request #7146 from k0ral/git
git: 2.3.4 -> 2.3.5
2015-04-03 13:31:10 +02:00
koral
d54b6c903d git: 2.3.4 -> 2.3.5 2015-04-03 10:57:36 +00:00
koral
29dc55abc3 mercurial: 3.3.2 -> 3.3.3 2015-04-03 09:58:16 +00:00
Eelco Dolstra
c82dc7018d Remove unused Darcs expression 2015-03-27 16:17:48 +01:00
William A. Kennington III
06ea226495 cgit: 0.10.2 -> 0.11.2 2015-03-26 17:15:29 -07:00
William A. Kennington III
cd3b460200 tig: 2.0.3 -> 2.1 2015-03-26 16:41:05 -07:00
William A. Kennington III
940d381d73 git: 2.3.3 -> 2.3.4 2015-03-26 14:03:51 -07:00
Michael Raskin
61e573fcb6 Update fossil; use repository-generated tarball because release tarballs disappear 2015-03-26 10:12:25 +03:00
koral
8797078695 git: 2.3.2 -> 2.3.3 2015-03-17 17:18:12 +00:00
Eelco Dolstra
b2000f05d9 Merge pull request #6758 from k0ral/mercurial
mercurial: 3.2.4 -> 3.3.2
2015-03-11 15:52:16 +01:00
koral
7b4d8d361d mercurial: 3.2.4 -> 3.3.2 2015-03-11 14:45:53 +00:00
lethalman
9b699bc9a9 Merge pull request #6705 from bobvanderlinden/gitcola
git-cola: add package
2015-03-11 15:35:37 +01:00
koral
5d0cc81d08 git: 2.3.1 -> 2.3.2
(cherry picked from commit 50933385c5)
2015-03-10 13:20:02 +01:00
koral
a0da8638d6 git: 2.3.0 -> 2.3.1
(cherry picked from commit 36c1a8a6c7)
2015-03-10 13:19:41 +01:00
Bob van der Linden
08ea20df65 git-cola: add package 2015-03-08 01:39:29 +01:00
Luca Bruno
68d23e2134 Merge branch 'meld'. Closes #6595 2015-03-01 12:54:13 +01:00
Luca Bruno
c40cb390f8 meld: fix gsettings schemas and remove LD_LIBARY_PATH 2015-03-01 12:51:36 +01:00
Thomas Tuegel
4ef3c64d2e vsch: fetch release tarballs, not git revisions
We only update at releases anyway, so it doesn't really make sense to
use fetchgit. Plus, it makes monitor.nixos.org useless because we're
inevitably behind master.
2015-02-25 16:14:36 -06:00
Nikolay Amiantov
c6e0178d40 gitlab: fix checksum 2015-02-18 19:25:13 +03:00
Dan Peebles
a78d164b1e Minor fixes for git on darwin (libiconv and Security dependencies) 2015-02-17 22:30:59 -05:00
Shea Levy
2f061ff16b Merge remote-tracking branch 'origin/staging'
Darwin and haskell fixes.
2015-02-17 13:52:37 -05:00
Marco Maggesi
07bac418d2 Update fossil to version 1.30 2015-02-15 15:34:29 +01:00
Eric Seidel
e08b9ab8d3 kill libiconvOr*
Conflicts:
	pkgs/applications/networking/mailreaders/sup/default.nix
	pkgs/development/compilers/ghc/7.8.3-binary.nix
	pkgs/development/interpreters/php/5.3.nix
	pkgs/development/interpreters/ruby/patches.nix
	pkgs/development/libraries/cairo/default.nix
	pkgs/development/libraries/poppler/default.nix
	pkgs/top-level/all-packages.nix
2015-02-07 20:29:28 -08:00
Peter Simons
ad1417ed0e git: update to version 2.3.0 2015-02-06 13:59:57 +01:00
Edward O'Callaghan
e7ecb78aab version-management/gitolite: Bump version 3.6.1 -> 3.6.2
Signed-off-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>
2015-01-29 23:45:50 +11:00
lethalman
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
Peter Simons
b5ed72ceec rcs: update from 5.9.3 to 5.9.4 2015-01-27 14:04:54 +01:00
Charles Strahan
cb395eaadb gitlab-shell: fix evaluation 2015-01-25 16:28:20 -05:00
Charles Strahan
6eaa419920 gitlab: fix evaluation 2015-01-25 16:28:18 -05:00
Vladimír Čunát
45a34f65fe meld: drop gnome2.scrollkeeper (no longer used)
Also indent the overlong lines in the expression.
2015-01-25 08:59:05 +01:00
Edward Tjörnhammar
770e73ee6e Merge pull request #5893 from qknight/meld_upgrade
meld: bump to 3.12.3 (latest) version
2015-01-23 13:06:54 +01:00
Peter Simons
7149878010 git-annex: switch attribute over to haskell-ng package set some more 2015-01-22 23:29:09 +01:00
Peter Simons
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
Charles Strahan
8085f088cb ruby: exorcise the last few remaining rubyPackages 2015-01-21 22:23:37 -05:00
Joachim Schiele
b8c2f466ba meld: bump to 3.12.3 (latest) version 2015-01-21 22:02:20 +01:00
Charles Strahan
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