Commit graph

1330 commits

Author SHA1 Message Date
Vladimír Čunát 4917a4f8b3 Merge master into staging 2015-10-23 01:57:14 +02:00
Brian McKenna c6c1d3f777 pijul: init at 0.1 2015-10-21 21:35:02 +11:00
William A. Kennington III cc2f78573e git: 2.5.3 -> 2.6.2 2015-10-18 17:23:51 -07:00
William A. Kennington III 8a44a36ca4 Merge branch 'master.upstream' into staging.upstream 2015-10-15 10:22:28 -07:00
Desmond O. Chang b41742414e git-crypt: update maintainer 2015-10-14 21:46:27 +08:00
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
Vladimír Čunát 38313d5d87 libxml2,libxslt: split into multiple outputs
Fixed all references, hopefully.
libxml2Python is slightly hacky now, but it seems to work.
2015-10-05 13:44:16 +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
muflax 98556ef150 git-remote-hg: fix compatibility with mercurial 3.2
Close #5458.
2015-01-20 15:49:59 +01:00
Robert Helgesson 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
Ludovic Courtès 41b53577a8 unmaintain a bunch of packages 2015-01-13 22:33:49 +01:00
aszlig 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
Arseniy Seroka 269568b7ea Merge pull request #5565 from kirelagin/hub
gitAndTools.hub: Update to 2.x
2015-01-10 10:42:19 +03:00
William A. Kennington III c82410eeda java: Normalize to the default jre / jdk 2015-01-07 14:55:41 -08:00
Eelco Dolstra 0b8ac6b791 mercurial: Update to 3.2.4 2015-01-06 14:29:22 +01:00
Peter Simons d8c600c129 haskell-git-annex: update to version 5.20141231 2015-01-05 18:39:18 +01:00
Kirill Elagin 4b84049bd3 gitAndTools.hub: Update to 2.x 2015-01-04 02:28:38 +03:00
John Wiegley eba9d0d8fa subversion: Add several compiler definitions for Darwin 2015-01-03 07:53:06 -05:00
John Wiegley 58ae62b9fa hub: add git as a dependency of the expression 2015-01-03 07:53:01 -05:00
Charles Strahan 94dd4b9721 ruby: WIP 2014-12-30 21:05:00 -05:00
Arseniy Seroka 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
koral 10b3d1ad7b fast-export: update to last revision from upstream 2014-12-30 14:54:12 +01:00
Domen Kožar 6dc71c19b0 Merge pull request #5480 from lostdj/ltp/upstream-master/smartgit653
SmartGitHg: update from 6.0.6 to 6.5.3.
2014-12-30 03:47:14 +01:00
Tobias Geerinckx-Rice c64257b8e5 Fix user-facing typos (mainly in descriptions) 2014-12-30 03:31:03 +01:00
Charles Strahan 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
Thomas Tuegel e5e6931088 vcsh: add ttuegel as maintainer 2014-12-28 09:00:49 -06:00
Thomas Tuegel a1860dab81 vcsh: bump version to 1.20141026 2014-12-28 09:00:38 -06:00
lostdj cf8a716baa SmartGitHg: update from 6.0.6 to 6.5.3. 2014-12-27 11:28:38 +03:00
Peter Simons 8298636254 haskell-git-annex: update to version 5.20141219 2014-12-25 11:05:49 +01:00
Pascal Wittmann f94580da69 Fix license attribute of many bsd-like licensed packages 2014-12-21 00:00:35 +01:00
Tom 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
Eelco Dolstra cb5433b8de mercurial: Update to 3.2.2 2014-12-18 14:11:10 +01:00
Eelco Dolstra 49282dd1af subversion: Update to 1.8.11 2014-12-18 14:11:10 +01:00
Domen Kožar ba5fad6dfa Merge pull request #5323 from offlinehacker/gitlab_i686_fix
gitlab: fix i686-linux build and module
2014-12-14 09:48:44 +01:00
Jaka Hudoklin 90683792aa gitlab: fix i686-linux build and module
It turns out that installing therubytracer, with dependency on old v8, even
when using source libv8 version is problematic.
(see
http://stackoverflow.com/questions/21666379/problems-installing-gitlab-on-odroid-v8-lib-not-available).

But wait, rails does not even need therubytracer, just any kind of javascript
server side execution framework like nodejs. Well just use that, as also
suggested from different internet sources (look link above), it works just
fine.
2014-12-14 02:24:12 +01:00
Peter Simons 1a0505143c haskell-github-backup: update to version 1.20141204 2014-12-13 12:06:02 +01:00
Jaka Hudoklin 13e58784bf nixos/gitlab: fixes
- fix timezone data not found
- fix module, add simple test
- allow to set port
2014-12-12 18:01:31 +01:00
Thomas Hunger 59995e168c nixos: Add gitlab and gitlab-shell
I had to make several adjustments to make it work with nixos:

* Replace relative config file lookups with ENV variable.
* Modify gitlab-shell to not clear then environment when running
  pre-receive.
* Modify gitlab-shell to write some environment variables into
  the .authorized_keys file to make sure gitlab-shell reads the
  correct config file.
* Log unicorn output to syslog.
  I tried various ways of adding a syslog package but the bundler would
  not pick them up. Please fix in a better way if possible.
* Gitlab-runner program wrapper.
  This is useful to run e.g. backups etc. with the correct
  environment set up.
2014-12-12 18:01:29 +01:00
Massimo Zaniboni 32f9644943 redmine: use libc libciconv implementation on Linux. 2014-12-12 01:20:53 +01:00
Maciek Starzyk dcad10c8e6 haskell-git-annex: Add maintainer, was removed by mistake. 2014-12-04 21:49:15 +01:00
Maciek Starzyk 81cb2c144c haskell-git-annex: update to version 5.20141203 2014-12-04 14:45:54 +01:00
Pascal Wittmann 5e04917e65 gource: fix build with new glm version 2014-12-04 14:31:28 +01:00
wmertens 45c1b9147f Merge pull request #5130 from wmertens/git-ssl-env
Let git use $SSL_CERT_FILE
2014-11-27 13:24:08 +01:00
Shea Levy 64453d01f4 src: bump 2014-11-26 18:25:13 -05:00
Spencer Whitt fdbd5e1323 New package: git-extras 2014-11-25 20:24:43 -05:00
Wout Mertens 272f2c365c git: Support $SSL_CERT_FILE 2014-11-26 00:29:37 +01:00
Henry Till d4bd9779dc mr: update to 1.20141024 2014-11-22 09:30:30 -05:00
Shea Levy 5c7c63af66 Add src revision control software 2014-11-21 16:12:33 -05:00
Pascal Wittmann fb5dfbdbc7 gource: update from 0.42 to 0.43 and adopt it 2014-11-19 08:47:41 +01:00
Charles Strahan e51afe5e7c fix hub 2014-11-18 04:07:30 +00:00
Vladimír Čunát b4af993c3f Merge branch 'master' into staging
Conflicts (simple):
	pkgs/development/lisp-modules/clwrapper/setup-hook.sh
2014-11-14 14:28:23 +01:00
Peter Simons d1cec0c92d haskell-github-backup: update to version 1.20141110 2014-11-13 14:51:36 +01:00
Vladimir Kirillov 1b9f756e4e git: do not do install-doc when !withManual 2014-11-12 17:36:17 +02:00
Luca Bruno 6af0d6974f Merge branch 'master' into staging 2014-11-10 10:03:52 +01:00
Charles Strahan cf8f4963a7 rename rubyLibs to rubyPackages 2014-11-09 22:16:58 +00:00
Peter Simons 820f6f2e4c haskell-git-annex: update to version 5.20141125 2014-11-09 14:59:30 +01:00
Luca Bruno 83221f3886 Merge branch 'master' into staging
Makes the build more useful:
- Disabled hybrid iso, makes installer tests pass again
- Imagemagick fixes to the "Illegal instruction" thing
2014-11-08 15:56:40 +01:00
Eelco Dolstra dde6d5708c Add set apacheHttpdPackages containing modules for specific Apache versions
Similar to linuxPackages etc.
2014-11-07 12:08:30 +01:00
Eelco Dolstra 0518ccf5af Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/stdenv/generic/default.nix
2014-11-06 10:16:39 +01:00
Mateusz Kowalczyk 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
Vladimír Čunát 52404a868d Merge recent master into staging
Nixpkgs Hydra: ?compare=1157272

TODO: port e22889064f

Conflicts:
	nixos/tests/gnome3_10.nix (auto-solved)
	pkgs/applications/video/aegisub/default.nix
	pkgs/development/libraries/boost/1.55.nix
2014-11-05 15:00:44 +01:00
Eelco Dolstra 7495c61d49 Merge remote-tracking branch 'origin/darwin-clang-stdenv' into staging
Conflicts:
	pkgs/applications/editors/vim/macvim.nix
2014-11-04 14:30:43 +01:00
William A. Kennington III a9c472d16e boost: Fix incompatible applications 2014-11-02 17:22:28 -08:00
William A. Kennington III aa3e800be7 boost: Remove boost.lib 2014-11-02 17:22:27 -08:00
Adam Bouhenguel 8e09c97d1c Bump git-repo to 1.21
Still no versioned URL, but there’s been a new release. SHA1 pulled
from http://source.android.com/source/downloading.html#installing-repo.
2014-11-01 17:28:25 -07:00
Peter Simons 0a2e12e046 haskell-github-backup: update to version 1.20141031 2014-11-01 21:08:04 +01:00
Peter Simons eac1d21819 darcs: jailbreak to fix build with latest version of 'text' 2014-11-01 21:08:03 +01:00
Linquize 23048155b7 git: Update to 2.1.3 2014-10-30 17:22:47 +01:00
Peter Simons 8b12277065 haskell-git-annex: update to version 5.20141024 2014-10-26 23:44:48 +01:00
Peter Simons cc48a930ae haskell-git-annex: update to version 5.20141013 2014-10-18 17:48:48 +02:00
John Wiegley ba22560768 git-annex: temporary patch to build the current version 2014-10-16 17:23:01 -05:00
Peter Simons 38751005a1 git-annex: broken by update to 'persistent' and 'yesod' 2014-10-14 17:39:35 +02:00
Peter Simons 8c3757a24d darcs: jailbreak to fix build with random 1.x 2014-10-14 17:39:33 +02:00
Eelco Dolstra 462fdfe108 mercurial: Update to 3.1.2 2014-10-14 14:37:29 +02:00
Eelco Dolstra 811de3bfaa Merge remote-tracking branch 'origin/staging' into darwin-clang-stdenv
Conflicts:
	pkgs/tools/security/gnupg/default.nix
2014-10-09 10:57:57 +02:00
Michael Raskin 57e0b9de65 Apparently now monotoneViz source got fixed 2014-10-09 10:34:11 +04:00
Michael Raskin af53f40684 Update Monotone-viz source 2014-10-08 22:06:15 +04:00
Aristid Breitkreuz 977ad646e9 rcs: update from 5.9.2 to 5.9.3 2014-10-07 22:40:06 +02:00
Domen Kožar 8f27aedb46 add redmine package 2014-10-07 10:54:22 +02:00
Peter Simons 066db30729 haskell-git-annex: update to version 5.20140927 2014-10-06 11:21:39 +02:00
Linquize 16494e0289 git: Update to 2.1.2 2014-10-03 23:13:38 +08:00
Eelco Dolstra 6db6dea4c9 subversion: Remove apparently unnecessary environment variables
At least it seems to build fine (and use clang) without them.
2014-09-24 18:55:09 +02:00
Eelco Dolstra 542a4d0287 subversion: Fix broken configure flags
This caused an impure dependency on libsasl on Darwin.
2014-09-24 18:51:29 +02:00
Eelco Dolstra bf44536c79 mercurial: Update to 3.1.1 2014-09-23 12:03:11 +02:00
Eelco Dolstra cd71f7a2e6 Merge branch 'darwin-stdenv' of github.com:joelteon/nixpkgs into staging
Conflicts:
	pkgs/development/interpreters/ruby/ruby-19.nix
	pkgs/development/libraries/libc++/default.nix
	pkgs/development/libraries/libc++abi/default.nix
	pkgs/tools/text/sgml/opensp/default.nix
2014-09-23 11:27:53 +02:00
William A. Kennington III 31220480d8 boost: Update depdendent packages 2014-09-21 17:20:59 -07:00
Ellis Whitehead 8ea7e926cc Add myself to the maintainers list 2014-09-21 02:13:28 +01:00
Ellis Whitehead 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
lostdj d8fc19da05 SmartGitHg: don't assume we're on OpenJDK and replace JDK dependency
with JRE.

Closes #4081.

Signed-off-by: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
2014-09-20 23:11:35 +01:00
Peter Simons 82a46ebb5c haskell-git-annex: update to version 5.20140919 2014-09-20 18:00:04 +02:00
Peter Simons 89438059ab haskell-git-annex: update to version 5.20140915 2014-09-17 21:16:10 +02:00
Peter Simons 70caf9d865 git-annex: broken by optparse-applicative 0.10.x
Bug has been reported upstream.
2014-09-14 00:06:45 +02:00
Dmitry Malikov 7d0a7ed62c gitAndTools.tig: update from 2.0.2 to 2.0.3 2014-09-13 22:25:17 +02:00
Nick Sauce 759cc041ed smartgithg: new package
@vcunat added meta.platforms.
2014-09-11 21:51:01 +02:00
Joel Taylor 7da056233f wip libc++ 2014-09-09 13:54:25 -07:00
Joel Taylor 3e8344d334 suitable clang stdenv 2014-09-09 13:54:24 -07:00
Eelco Dolstra 4ae3e32e82 Merge pull request #4012 from ibeex/master
added darwin as supported platform for meld
2014-09-09 15:35:58 +02:00
Ivan Brkanac 841f45b231 added darwin ass supported platform for meld, added get text as requirement for scroollkeeper 2014-09-09 15:21:04 +02:00
Domen Kožar 78e5e556cc Revert "fixes #1923"
This reverts commit 1849840aa3.

Breaks git-annex
2014-09-09 12:11:53 +02:00
Domen Kožar 1849840aa3 fixes #1923 2014-09-08 21:19:14 +02:00
Moritz Ulrich c5697874c2 diffuse: update from 0.4.7 to 0.4.8 2014-09-04 19:31:33 +02:00
Moritz Ulrich 32a3b65571 cgit: update from 0.10.1 to 0.10.2 2014-09-04 19:31:32 +02:00