JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
120,917 Commits 2 Branches 0 Tags 13 GiB
13cd3c0d27
Commit Graph

1720 Commits

Author SHA1 Message Date
Nikolay Amiantov
661641aeb7 git-and-tools: move to callPackage 2016-04-20 18:55:48 +03:00
Tadas Barzdzius
a2973df033 pijul: use stable rustPlatform 2016-04-20 15:08:12 +03:00
Robin Gloster
d020caa5b2 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-04-18 13:49:22 +00:00
Nikolay Amiantov
8b7ebaffeb replace makeSearchPath tree-wise to take care of possible multiple outputs 2016-04-13 22:09:41 +03:00
Vladimír Čunát
39ebb01d6e Merge branch 'staging', containing closure-size #7701 2016-04-13 09:25:28 +02:00
Nathan Zadoks
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
Dan Connolly
a4ce0e233b tortoisehg: 3.6 -> 3.7.1, fixes package 
fixes #13507

On June 8 (e8655ee) tortoisehg changed the way
it computes the `/usr/share` directory in a way that
invalidated the assumptions behind the use
of substituteInPlace in postUnpack.
 2016-04-11 10:35:31 +02:00
Vladimír Čunát
30f14243c3 Merge branch 'master' into closure-size 
Comparison to master evaluations on Hydra:
  - 1255515 for nixos
  - 1255502 for nixpkgs
 2016-04-10 11:17:52 +02:00
Graham Christensen
f9099deb8e mercurial: 3.7.1 -> 3.7.3 for multiple CVEs 
CVE-2016-3068

    Blake Burkhart discovered that Mercurial allows URLs for Git
    subrepositories that could result in arbitrary code execution on
    clone.

CVE-2016-3069

    Blake Burkhart discovered that Mercurial allows arbitrary code
    execution when converting Git repositories with specially
    crafted names.

CVE-2016-3630

    It was discovered that Mercurial does not properly perform bounds-
    checking in its binary delta decoder, which may be exploitable for
    remote code execution via clone, push or pull.
 2016-04-07 21:24:49 -05:00
Vladimír Čunát
d1df28f8e5 Merge 'staging' into closure-size 
This is mainly to get the update of bootstrap tools.
Otherwise there were mysterious segfaults:
https://github.com/NixOS/nixpkgs/pull/7701#issuecomment-203389817
 2016-04-07 14:40:51 +02:00
Vladimír Čunát
ab15a62c68 Merge branch 'master' into closure-size 
Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.
 2016-04-01 10:06:01 +02:00
Franz Pletz
2e08d8234e Merge remote-tracking branch 'origin/master' 2016-03-31 10:06:30 +02:00
Bob van der Linden
318fdda01c git-cola: 2.2.1 -> 2.5 2016-03-30 20:25:50 +02:00
zimbatm
0592eb377e Merge pull request #14207 from zimbatm/git-and-ssh 
git: add openssh as a runtime dependency
 2016-03-30 10:23:55 +01:00
Robin Gloster
a4e65c3639 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-03-30 09:01:20 +00:00
Louis Taylor
69c6f7e20a git: 2.7.4 -> 2.8.0 2016-03-29 07:21:41 +01:00
Robin Gloster
f60c9df0ba Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-03-28 15:16:29 +00:00
Frederik Rietdijk
4c13595507 Merge pull request #14093 from matthiasbeyer/add-be 
bugseverywhere: init at 1.1.1
 2016-03-28 14:39:38 +02:00
Matthias Beyer
729c069108 bugseverywhere: init at 1.1.1 2016-03-28 14:35:47 +02:00
Domen Kožar
b07e7bfc7b Merge remote-tracking branch 'origin/staging' 2016-03-27 13:19:04 +01:00
zimbatm
6579acd015 git: add openssh as a runtime dependency 
Fixes #1923
 2016-03-26 14:39:57 +00:00
Evgeny Egorochkin
5db2d9366b subversion: fix hash 2016-03-21 12:47:54 +02:00
zimbatm
64fe2b5eb6 gitlab: remove unused parameter 2016-03-19 22:04:12 +00:00
Yann Hodique
31c317e09e git: 2.7.3 -> 2.7.4 2016-03-18 18:07:33 -07:00
Franz Pletz
1cd99b1a48 gitlab: 8.5.5 -> 8.5.7 2016-03-17 03:39:16 +01:00
Peter Simons
abcf57a8db git: update from version 2.7.1 to 2.7.3 2016-03-16 21:35:55 +01:00
Robin Gloster
3f45f0948d Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-03-15 01:44:24 +00:00
joachifm
94f7f756b0 Merge pull request #13855 from jraygauthier/jrg/update_smart_git_from_710_to_712 
smartgit: 7.1.0 -> 7.1.2
 2016-03-14 15:12:30 +00:00
Raymond Gauthier
62f47641b1 smartgithg: 7.1.0 -> 7.1.2 
Also fixes broken download link.
 2016-03-14 10:27:22 -04:00
Robin Gloster
3f9b00c2d8 Merge pull request #13906 from Zer0-/gitlab_version_bump 
Gitlab version bump
 2016-03-14 13:29:13 +01:00
Philipp Volguine
a2424fffd3 Gitlab package version 8.5.1 -> 8.5.5 
-had to bump the versions on a few gem dependencies
 2016-03-13 21:05:11 +00:00
Graham Christensen
bdb1e5c73f svn: convert sha1 to sha256 2016-03-11 15:54:55 -06:00
Eelco Dolstra
dd53c65dcc Merge remote-tracking branch 'origin/gcc-5' into staging 
Still some breakage but no blockers:

http://hydra.nixos.org/eval/1242130?filter=x86_64-linux&compare=1237852&full=#tabs-now-fail
 2016-03-11 16:02:38 +01:00
Vladimír Čunát
09af15654f Merge master into closure-size 
The kde-5 stuff still didn't merge well.
I hand-fixed what I saw, but there may be more problems.
 2016-03-08 09:58:19 +01:00
Franz Pletz
e9fc4e7db6 Merge remote-tracking branch 'origin/master' into hardened-stdenv 2016-03-07 22:08:27 +01:00
zimbatm
75d7692ab3 gitAndTools.darcsToGit: 0.2git -> 2015-06-04 
Fixes error where ruby 2.0+ doesn't have iconv anymore.

    `require': cannot load such file -- iconv (LoadError)
 2016-03-05 18:45:39 +00:00
Franz Pletz
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
Robin Gloster
fed49425c5 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-03-03 16:11:55 +00:00
Nathan Zadoks
819dab0203 git-remote-hg: fix the derivation name 
-v0.2 isn't parsed as a version by Nix, and makes it inconvenient to
install git-remote-hg through nix-env.
 2016-03-03 14:51:31 +01:00
Eelco Dolstra
1c74a16e10 rcs: Fix build on gcc 5 
http://hydra.nixos.org/build/32624218
 2016-03-03 13:10:22 +01:00
Robin Gloster
4c9c4c4dcd redmine: disable format hardening 2016-03-01 22:47:29 +00:00
Robin Gloster
d47857c3d9 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-03-01 21:09:17 +00:00
zimbatm
de8c119a4b redmine: fix compilation with ruby 2.3 
Just bumped the JSON dependency manually to the one bundled with ruby 2.3
 2016-02-29 10:02:59 +00:00
Robin Gloster
3b4765c9e5 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-02-28 16:32:57 +00:00
Bjørn Forsman
070dccae7b gitstats: init at 2016-01-08 
Upstream does not make releases, using latest commit from master branch.
 2016-02-28 15:00:52 +01:00
Bjørn Forsman
d589391202 gitinspector: 0.4.1 -> 0.4.4 2016-02-28 11:32:09 +01:00
Graham Christensen
73f6410851 cgit: 0.11.2 -> 0.12 for CVE-2016-1899 CVE-2016-1900 CVE-2016-1901 2016-02-27 15:35:19 -06:00
zimbatm
17348dc094 Remove all dots at end of descriptions 
Specially crafted for @JagaJaga

    find pkgs -name "*.nix" -exec \
      sed -e 's|\(description.*\)\.";|\1";|g' -i {} \;
 2016-02-27 17:30:29 +00:00
Robin Gloster
3477e662e6 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-02-27 00:08:08 +00:00
zimbatm
8d4c2340d3 Merge pull request #13396 from mayflower/pkg/gitlab 
gitlab: 8.0.5 -> 8.5.1, service improvements
 2016-02-26 11:19:28 +00:00
Franz Pletz
af17efd014 Merge pull request #13466 from benley/git-stree-0.4.5 
git-stree: init at 0.4.5
 2016-02-26 09:59:47 +01:00
Franz Pletz
c2412bd700 fixup! gitlab: 8.0.5 -> 8.5.0, service improvements 
8.5.0 -> 8.5.1
 2016-02-26 08:31:21 +01:00
Franz Pletz
bcfa59bf82 gitlab: 8.0.5 -> 8.5.0, service improvements 
Updates gitlab to the current stable version and fixes a lot of features that
were broken, at least with the current version and our configuration.

Quite a lot of sweat and tears has gone into testing nearly all features and
reading/patching the Gitlab source as we're about to deploy gitlab for our
whole company.

Things to note:

 * The gitlab config is now written as a nix attribute set and will be
   converted to JSON. Gitlab uses YAML but JSON is a subset of YAML.
   The `extraConfig` opition is also an attribute set that will be merged
   with the default config. This way *all* Gitlab options are supported.

 * Some paths like uploads and configs are hardcoded in rails  (at least
   after my study of the Gitlab source). This is why they are linked from
   the Gitlab root to /run/gitlab and then linked to the  configurable
   `statePath`.

 * Backup & restore should work out of the box from another Gitlab instance.

 * gitlab-git-http-server has been replaced by gitlab-workhorse upstream.
   Push & pull over HTTPS works perfectly. Communication to gitlab is done
   over unix sockets. An HTTP server is required to proxy requests to
   gitlab-workhorse over another unix socket at
   `/run/gitlab/gitlab-workhorse.socket`.

 * The user & group running gitlab are now configurable. These can even be
   changed for live instances.

 * The initial email address & password of the root user can be configured.

Fixes #8598.
 2016-02-26 07:08:31 +01:00
zimbatm
428e12d23f Merge pull request #13154 from zimbatm/git-rebase-fix-v2 
git: fixes references to gettext properly
 2016-02-26 00:03:17 +00:00
Benjamin Staffin
fe6ad9e912 git-stree: init at 0.4.5 2016-02-25 15:26:06 -08:00
Benjamin Staffin
ca5f243697 git-and-tools: alphabetize attributes before it gets too huge 2016-02-25 14:23:34 -08:00
Robin Gloster
40c586b7ce Merge pull request #13427 from k0ral/mercurial 
mercurial: 3.5.1 -> 3.7.1
 2016-02-25 17:00:58 +01:00
koral
d4193c82c1 mercurial: 3.5.1 -> 3.7.1 2016-02-24 16:39:03 +01:00
Wout Mertens
677893f92b Merge pull request #13422 from k0ral/git 
git: 2.7.0 -> 2.7.1
 2016-02-24 15:09:28 +01:00
koral
c1504c5a94 git: 2.7.0 -> 2.7.1 2016-02-24 13:47:23 +01:00
Frederik Rietdijk
40ca841c5c Merge pull request #13124 from FRidh/buildPythonApplication 
buildPythonApplication: use new function for Python applications
 2016-02-23 16:02:10 +01:00
Robin Gloster
4036e9ba8c Merge branch 'up' into hardened-stdenv 2016-02-20 22:27:33 +00:00
zimbatm
11733b39b5 git: fixes references to gettext properly 
A better implementation of 5273dbf530

Fixes https://github.com/NixOS/nixpkgs/issues/13150

The attached patch removes a whole swath of unnecessary runtime gettext
detection. It also adds gettext on the PATH so that git-rebase can find it.
 2016-02-20 14:47:23 +00:00
Ricardo M. Correia
fd3e02add8 Merge pull request #13027 from puffnfresh/package/pijul 
pijul: 0.1 -> 0.2-6ab9ba
 2016-02-20 15:43:53 +01:00
Robin Gloster
bc21db3692 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-02-19 21:16:14 +00:00
Frederik Rietdijk
4d06bf70f4 buildPythonApplication: use new function for Python applications 2016-02-19 13:16:41 +01:00
Vladimír Čunát
e9520e81b3 Merge branch 'master' into staging 2016-02-17 10:06:31 +01:00
zimbatm
c38eb526d5 git: fix references to gettext in bash scripts 
See #13047
 2016-02-16 21:01:21 +00:00
Brian McKenna
93328bbd62 pijul: 0.2-6ab9ba 
Maintainer has been working with us, this commit was given by them.
 2016-02-17 07:28:26 +11:00
Franz Pletz
41698c9efa Merge branch 'master' into hardened-stdenv 2016-02-15 20:05:29 +01:00
Vladimír Čunát
d039c87984 Merge branch 'master' into closure-size 2016-02-14 08:33:51 +01:00
Vladimír Čunát
4538e70661 smartgithg: update 7_0_2 -> 7_1_0 2016-02-10 23:03:15 +01:00
Robin Gloster
c9aceaea86 gitAndTools.qgit: turn off format hardening 2016-02-09 11:04:13 +00:00
Robin Gloster
e06726ba15 rcs: use std=gnu99 to compile with gcc5 2016-02-09 01:23:58 +00:00
Robin Gloster
53e3de101b cvs: turn off format hardening 2016-02-07 19:23:40 +00:00
Vladimír Čunát
a115bff08c Merge branch 'master' into staging 2016-02-07 13:52:42 +01:00
Robin Gloster
9229e9c656 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-02-07 11:17:57 +00:00
Robin Gloster
5b67ed7c55 Merge pull request #12819 from Beauhurst/hg_crecord_revert 
hg_crecord: revert changes adding mercurial crecord
 2016-02-05 21:24:19 +01:00
Michael Raskin
0d1a188c5d Re-add Monotone-Viz with Fedora as a source 2016-02-04 20:13:49 +01:00
Robert Scott
d192057519 hg_crecord: revert changes adding mercurial crecord 
crecord is included in modern hg releases - I failed to realize this.
 2016-02-04 15:13:24 +00:00
Vladimír Čunát
54299b60c4 Merge #12779: Mass replace pkg}/bin-style strings 
... to refer to correct outputs
 2016-02-03 17:25:22 +01:00
Vladimír Čunát
ae74c356d9 Merge recent 'staging' into closure-size 
Let's get rid of those merge conflicts.
 2016-02-03 16:57:19 +01:00
Guillaume Maudoux
9f358f809d Configure a default trust store for openssl 2016-02-03 12:42:01 +01:00
Luca Bruno
b70310da23 Merge pull request #12750 from henrytill/mr 
mr: 1.20150503 -> 1.20160123
 2016-02-01 23:47:45 +01:00
Tuomas Tynkkynen
e97e690244 treewide: Mass replace 'xz}/bin' to refer the 'bin' output 2016-02-01 20:46:28 +02:00
Tuomas Tynkkynen
5f4a8de754 treewide: Mass replace 'bzip2}/bin' to refer the 'bin' output 2016-02-01 20:45:57 +02:00
Henry Till
79b326e9e9 mr: 1.20150503 -> 1.20160123 2016-02-01 11:24:01 -05:00
Robin Gloster
9d7e2baf3b viewmtn: remove, source is offline and pkg dead 2016-01-30 20:31:04 +00:00
Robin Gloster
f295fef411 tailor: refactor from builderDefsPackage 2016-01-30 20:31:04 +00:00
Robin Gloster
6950c43467 monotoneViz: delete 
not updated in 5 years and broken build
 2016-01-30 20:31:04 +00:00
Robin Gloster
2c3013f55b cvs: Remove unneeded configureFlags 2016-01-30 20:31:01 +00:00
Robin Gloster
f6d3b7a2ae switch hardening flags 2016-01-30 16:36:57 +00:00
Franz Pletz
954e9903ad Use a hardened stdenv by default 2016-01-30 16:36:57 +00:00
Jascha Geerds
f7578a4d32 gitflow: 1.8.0 -> 1.9.1 2016-01-27 17:15:42 +01:00
Christoph Hrdinka
890f000146 goPackages.git-annex-remote-b2: init at 0.2 2016-01-26 17:54:53 +01:00
Tobias Geerinckx-Rice
9fb8020e4e Add version attribute where maintainers |= nckx 
This will probably be mandatory soon, and is a step in the right
direction. Removes the deprecated meta.version, and move some meta
sections to the end of the file where I should have put them in
the first place.
 2016-01-25 17:35:21 +01:00
Vladimír Čunát
716aac2519 Merge branch 'staging' into closure-size 2016-01-19 09:55:31 +01:00
Vladimír Čunát
2d0893088f Merge branch 'master' into staging 2016-01-15 13:43:57 +01:00
Vladimír Čunát
c169718a6b git-bz: fix meta typo 
Thanks to @heydojo.
 2016-01-15 10:26:18 +01:00
Tobias Geerinckx-Rice
d1440745c6 git-bz: meta: un-break; fix licence; maintain 
CC @nbp (I assume it was abandoned years ago, apologies otherwise).
 2016-01-15 05:31:47 +01:00
Tobias Geerinckx-Rice
36a68c8b6b git-bz: 3.20110902 -> 3.2015-09-08 2016-01-15 05:31:47 +01:00
Tobias Geerinckx-Rice
123065aa3d git-bz: use callPackage and canonical package name 
Don't add a compatibility alias as this package was/is marked as
being broken anyway.
 2016-01-15 05:31:47 +01:00
Tobias Geerinckx-Rice
b466dab8b2 veracity: remove dead package 
Last updated in 2012, broken since 2013. (OK, fine, but—)
Homepage abandoned, mailing list dead. (Hm. Spooky)
Uses builderDefsPackage. (Eek)
 2016-01-09 23:15:16 +01:00
somaticweb
2c4c9bee13 git: 2.6.4 -> 2.7.0 
Also corrected the license, which is GPL2-only
 2016-01-05 22:15:17 -08:00
janus
a472d836f6 FreeBSD: apr-util, cyrus-sasl, berkeley db, glib, gnutls, kerberos, libelf-freebsd, openldap, serf, guile, tet, shishi, gawk, gnugrep 2016-01-01 17:01:13 +00:00
Vladimír Čunát
f9f6f41bff Merge branch 'master' into closure-size 
TODO: there was more significant refactoring of qtbase and plasma 5.5
on master, and I'm deferring pointing to correct outputs to later.
 2015-12-31 09:53:02 +01:00
Arseniy Seroka
729211de7a Merge pull request #11917 from jerith666/subgit 
subgit: init at 3.1.0
 2015-12-29 14:57:47 +03:00
Matt McHenry
090efc2907 subgit: init at 3.1.0 2015-12-28 22:59:23 -05:00
Arseniy Seroka
0b6f76a1d3 Merge pull request #11934 from makefu/cvs2svn 
cvs2svn: 2.0.1 -> 2.4.0
 2015-12-25 17:26:43 +03:00
makefu
47f17939c2 cvs2nix: 2.0.1 -> 2.4.0 2015-12-24 16:58:01 +01:00
Eric Merritt
6108bb8971 hub: 2.2.1 -> 2.2.2 2015-12-23 08:37:02 -08:00
Peter Simons
e5b15f6b52 Merge pull request #11838 from k0ral/git 
git: 2.6.3 -> 2.6.4
 2015-12-20 11:55:57 +01:00
koral
016e88b2d2 git: 2.6.3 -> 2.6.4 2015-12-19 17:37:37 +00:00
Peter Simons
95dc945759 Merge pull request #11774 from ip1981/ip1981/git-crypt 
git-crypt needs GnuPG
 2015-12-17 11:03:27 +01:00
Igor Pashev
85375fc5fc git-crypt needs GnuPG 2015-12-17 11:00:50 +03:00
Eelco Dolstra
e7ae72cfb1 subversion: 1.8.14 -> 1.8.15, 1.9.2 -> 1.9.3 
CVE-2015-5343, CVE-2015-5259.
 2015-12-16 15:21:58 +01:00
Eelco Dolstra
64792ffdaa subversion: Use callPackages 2015-12-16 15:21:58 +01:00
Luca Bruno
5b0352a6a4 Merge branch 'master' into closure-size 2015-12-11 18:31:00 +01:00
Pascal Wittmann
84b3af19b8 Merge pull request #11365 from nlewo/fix/git-review 
git-review: init at 1.25.0
 2015-12-05 16:32:12 +01:00
Vladimír Čunát
263fd55d4b Merge recent staging built on Hydra 
http://hydra.nixos.org/eval/1231884
Only Darwin jobs seem to be queued now,
but we can't afford to wait for that single build slave.
 2015-12-05 11:11:51 +01:00
Arseniy Seroka
0c05f14d53 Merge pull request #10535 from roblabla/feature-updateGitlab8.0.5 
gitlab: 7.4.2 -> 8.0.5
 2015-12-04 16:30:09 +03:00
roblabla
b7a4231aa2 gitlab: 7.4.2 -> 8.0.5 2015-12-04 01:14:24 +01:00
Antoine Eiche
e78fb0d59a git-review: init at 1.25.0 
This provides a git command for submitting branches to Gerrit.
 2015-12-02 12:36:01 +01:00
Luca Bruno
920b1d3591 Merge branch 'master' into closure-size 2015-11-29 16:50:26 +01:00
Tobias Geerinckx-Rice
2798b02ad0 Convert some *Flags from strings to lists 2015-11-26 23:45:31 +01:00
Luca Bruno
a412927924 Merge remote-tracking branch 'origin/master' into closure-size 2015-11-25 21:37:30 +01:00
Jude Taylor
69e7f3bb74 switch to zero underscores for sandbox profiles; remove generateFrameworkProfile 2015-11-21 12:10:33 -08:00
Jude Taylor
a63346e33c use single underscore for sandboxProfile 2015-11-21 11:17:30 -08:00
Vladimír Čunát
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
Jude Taylor
df80090d09 use per-derivation sandbox profiles 2015-11-19 11:31:06 -08:00
Philip Lykke Carlsen
d69e1956d7 tortoisehg: 3.4.2 -> 3.6 
It builds and runs. Tested very superficially with an empty repository.
 2015-11-17 22:09:38 +01:00
William A. Kennington III
6602f49495 Revert "Revert "Merge pull request #9543 from NixOS/staging.post-15.06"" 
This reverts commit 741bf840da.

This reverts the fallout from reverting the major changes.
 2015-11-14 12:32:51 -08:00
William A. Kennington III
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
Stéphane Jourdois
221965a918 tig: add libiconv dep on darwin 2015-11-07 13:51:43 +01:00
William A. Kennington III
1e7aa4f17d Merge branch 'master.upstream' into staging.upstream 2015-11-05 18:30:11 -08:00
William A. Kennington III
ebedbec72b git: 2.6.2 -> 2.6.3 2015-11-05 18:18:21 -08:00
William A. Kennington III
dd2de66d61 Merge branch 'master.upstream' into staging.upstream 2015-10-30 17:16:07 -07:00
Vladimír Čunát
c5579c9184 subversion: fixup some referrers after splitting 2015-10-28 10:22:59 +01:00
Tuomas Tynkkynen
c471cb866f subversion: Split into multiple outputs 2015-10-28 10:22:59 +01:00
Aaron Bull Schaefer
8e7d39835f transcrypt: init at 0.9.7 2015-10-25 23:22:21 +00:00
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
Moritz Ulrich
332395b262 Add myself as a maintainer to a bunch of packages. 2014-09-04 17:05:21 +02:00
Moritz Ulrich
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
Peter Simons
e5878fa70b git-annex: re-build expression with latest cabal2nix 2014-09-04 16:20:57 +02:00
Moritz Ulrich
cce6dd11b6 subversionClient: update from 1.8.9 to 1.8.10, potentially fixes CVE-2014-3504, CVE-2014-3522, CVE-2014-3528 2014-09-04 16:06:42 +02:00
Moritz Ulrich
4678ddc1c0 gitAndTools.svn2git: update from 2.2.5 to 2.3.2 2014-09-04 16:06:41 +02:00
Peter Simons
ccd4a52f68 haskell-git-annex: update to version 5.20140831 2014-09-02 11:48:19 +02:00
Michael Raskin
08131bd5d5 Update guitone 2014-09-01 00:38:07 +04:00
Longrin Wischnewski
a555193ee9 gource: update to version 0.42 2014-08-31 12:44:29 +02:00
Cray Elliott
f237f31b93 darcs updated to 2.8.5 
tested to work with ghc 7.8.3
 2014-08-25 15:58:21 -07:00
Bjørn Forsman
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
Peter Simons
3fad02dab8 haskell-git-annex: update to version 5.20140817 2014-08-19 23:47:59 +02:00
Rüdiger Sonderfeld
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
Linquize
1916bc0412 git: Update to 2.1.0 2014-08-17 06:18:38 +02:00
Vladimír Čunát
d75cf6fffb meld: update to latest stable 2014-08-16 18:58:51 +02:00
Peter Simons
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
Michael Raskin
05a3b156f0 Update Mercurial to version 3.1 2014-08-12 02:47:04 +04:00
Eelco Dolstra
2f056c5237 subversion: Fix build on Darwin 2014-08-09 23:54:58 +02:00
Peter Simons
9226fbf56a Merge remote-tracking branch 'origin/master' into staging. 2014-08-08 09:51:01 +02:00
Eelco Dolstra
b4c4e2d28d subversion: Update to 1.8.9 2014-08-05 11:46:04 +02:00
Peter Simons
2d326e5032 Merge remote-tracking branch 'origin/master' into staging. 
Conflicts:
	pkgs/desktops/e18/enlightenment.nix
 2014-08-04 16:51:47 +02:00
Mateusz Kowalczyk
7a45996233 Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
Eelco Dolstra
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
Peter Simons
62bb741348 haskell-github-backup: update to version 1.20140721 2014-07-22 14:20:57 +02:00
Eelco Dolstra
7f410ef923 Merge remote-tracking branch 'origin/master' into staging 
Conflicts:
	pkgs/misc/vim-plugins/default.nix
 2014-07-22 11:00:00 +02:00
Linquize
4201db70ed git: Update to 2.0.2 2014-07-20 23:49:45 +08:00
John Wiegley
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
Peter Simons
92faa6a009 haskell-git-annex: update to version 5.20140717 2014-07-18 17:30:47 +02:00
John Wiegley
d24df6e334 haskell-git-annex: corrections for darwin 2014-07-16 01:27:29 -05:00
Eelco Dolstra
b9d19af3e6 Merge remote-tracking branch 'origin/master' into staging 2014-07-15 12:14:35 +02:00
Peter Simons
5bfb58a8a2 Re-generate Haskell packages with cabal2nix. 2014-07-14 17:33:52 +02:00
Peter Simons
56c569a9cd haskell-github-backup: update to version 1.20140707 2014-07-14 17:33:51 +02:00
Peter Simons
af88d71b55 haskell-git-annex: update to version 5.20140709 2014-07-14 17:33:50 +02:00
Eelco Dolstra
ff97b7dbe6 Merge remote-tracking branch 'origin/master' into staging 2014-07-14 17:04:55 +02:00
Peter Simons
d2e731e111 Add "please don't edit" comment at the top of every auto-generated Haskell file. 2014-07-14 13:21:41 +02:00
Luca Bruno
6fb00303fb gitolite: fix aborted build due to non-deterministic fetchgit 2014-07-13 12:39:23 +02:00
John Wiegley
a25c35b89b git-annex: Allow building on darwin again 2014-07-09 17:52:18 -05:00
Peter Simons
f7f1e3f842 haskell-git-annex: update to version 5.20140707 2014-07-08 15:58:22 +02:00
Eelco Dolstra
95b828de42 Merge remote-tracking branch 'origin/master' into staging 2014-07-07 13:16:26 +02:00
Charles Strahan
6c15656a06 vcprompt: new package 
This adds the vcprompt utility, a little C program that prints a short string
with barebones information about the current working directory for various
version control systems.
 2014-07-02 02:43:47 -04:00
Eelco Dolstra
06fc1ec34d Merge remote-tracking branch 'origin/master' into staging 
Conflicts:
	pkgs/servers/serfdom/default.nix
 2014-07-01 11:25:41 +02:00
Eelco Dolstra
40f7b0f9df Another attempt to eradicate ensureDir 
See c556a6ea46.
 2014-06-30 14:56:10 +02:00
Rok Garbas
71812277d3 git-remote-add: new package added 2014-06-28 14:15:31 +01:00
Georges Dubus
bf1f2c6b1f git: Updated to 2.0.1 (close #3096) 2014-06-26 16:54:48 +02:00
Austin Seipp
2711f5772c gitolite: fix default update hooks 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-06-26 00:24:05 -05:00
Austin Seipp
13162e8cdb Fix gitolite docs 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-06-25 22:55:43 -05:00
Austin Seipp
ec4cd43ca8 gitolite: 3.6.1 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-06-25 22:54:18 -05:00
Charles Strahan
ffc485547f enable bazaar on darwin 2014-06-22 02:57:05 -04:00
Bjørn Forsman
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
John Wiegley
476700d56f git-annex: Build on Darwin, let Cabal determine proper flags 2014-06-21 09:20:46 -07:00
Peter Simons
92082524a9 Revert "add OPENSSL_X509_CERT_FILE to the git command environment" 
This reverts commit 88b5578a57 because of the
following issues:

 1) If $OPENSSL_X509_CERT_FILE is set in the current shell environment, then
    its value will overwrite any settings the user may have configured in
    http.sslCAInfo via git-config(1). If you are unaware of the wrapper, then
    this behavior is totally unexpected as $OPENSSL_X509_CERT_FILE is not
    supposed to have an effect on Git.

 2) The patch makes it impossible for Git users to use the $GIT_SSL_CAINFO
    environment variable as documented in git-config(1), because anything set
    there will be overwritten with the value of $OPENSSL_X509_CERT_FILE (which
    might be empty).

 3) The patch breaks other builds of packages that depend on Git, i.e.
    <http://hydra.nixos.org/build/11995872/nixlog/1/raw>.
 2014-06-21 13:15:50 +02:00
Paul Woolcock
88b5578a57 add OPENSSL_X509_CERT_FILE to the git command environment 2014-06-16 21:55:43 -04:00
Peter Simons
c5b7e2a2f2 haskell-git-annex: update to version 5.20140613 2014-06-16 16:12:36 +02:00
Michael Raskin
f4987a0edc Update Monotone and add source-updater script 2014-06-10 09:21:26 +04:00
John Wiegley
d0365a6cde git-annex: build on Darwin, and rely on cabal to set flags 
Fixes #2519
 2014-06-10 02:28:23 +00:00
Peter Simons
1a1c1ba734 haskell-git-annex: update to version 5.20140606 2014-06-09 10:26:59 +02:00
Peter Simons
8c14496987 haskell-git-annex: update to version 5.20140529 2014-06-09 10:26:53 +02:00
Rok Garbas
db8ba58402 tig: update to 2.0.2 2014-06-01 14:39:55 +01:00
Eelco Dolstra
61befa0451 git: Update to 1.9.4 2014-05-31 09:47:21 +02:00
Peter Simons
8de29ff4e1 haskell-git-annex: update to version 5.20140517 2014-05-21 23:04:30 +02:00
Bjørn Forsman
b8ca39e2f2 cgit: improve a comment 2014-05-17 11:01:57 +02:00
Linquize
10fa1bcf66 git: Update to 1.9.3 2014-05-15 16:15:09 +02:00
Peter Simons
fd0f9e6fc1 Re-write the Haskell Platform out of haskell-defaults.nix. 
1) Packages formerly called haskell-haskell-platform-ghcXYZ-VVVV.X.Y.Z are
    now called haskell-platform-VVVV.X.Y.Z. The latest version can be
    installed by running "nix-env -i haskell-platform".

 2) The attributes haskellPackages_ghcXYZ.haskellPlatform no longer exist.
    Instead, we have attributes like haskellPlatformPackages."2012_4_0_0".
    (The last numeric bit must be quoted when used in a Nix file, but not on
    the command line to nix-env, nix-build, etc.) The latest Platform has a
    top-level alias called simply haskellPlatform.

 3) The haskellPackages_ghcXYZ package sets offer the latest version of every
    library that GHC x.y.z can compile. For example, if 2.7 is the latest
    version of QuickCheck and if GHC 7.0.4 can compile that version, then
    haskellPackages_ghc704.QuickCheck refers to version 2.7.

 4) All intermediate GHC releases were dropped from all-packages.nix to
    simplify our configuration. What remains is a haskellPackages_ghcXYZ set
    for the latest version of every major release branch, i.e. GHC 6.10.4,
    6.12.3, 7.0.4, 7.2.2, 7.4.2, 7.6.3, 7.8.2, and 7.9.x (HEAD snapshot).

 5) The ghcXYZPrefs functions in haskell-defaults.nix now inherit overrides
    from newer to older compilers, i.e. an override configured for GHC 7.0.4
    will automatically apply to GHC 6.12.3 and 6.10.4, too. This change has
    reduced the redundancy in those configuration functions. The downside is
    that overriding an attribute for only one particular GHC version has become
    more difficult. In practice, this case doesn't occur much, though.

 6) The 'cabal' builder has a brand-new argument called 'extension'. That
    function is "self : super : {}" by default and users can override it to
    mess with the attribute set passed to cabal.mkDerivation. An example use
    would be the definition of darcs in all-packages.nix:

    | darcs = haskellPackages.darcs.override {
    |   cabal = haskellPackages.cabal.override {
    |     extension = self : super : {
    |       isLibrary = false;
    |       configureFlags = "-f-library " + super.configureFlags or "";
    |     };
    |   };
    | };

    In this case, extension disables building the library part of the package
    to give us an executable-only version that has no dependencies on GHC or
    any other Haskell packages.

    The 'self' argument refers to the final version of the attribute set and
    'super' refers to the original attribute set.

Note that ...

 - Haskell Platform packages always provide the Haddock binary that came with
   the compiler.

 - Haskell Platform 2009.2.0.2 is broken because of build failures in cgi and
   cabal-install.

 - Haskell Platform 2010.1.0.0 is broken becasue of build failures in cgi.
 2014-05-14 14:59:52 +02:00
Michael Raskin
6548fbfb28 Use the working source for GNU ARch 2014-05-03 00:20:08 +04:00
Peter Simons
551cae1aa0 haskell-git-annex: update to version 5.20140421 2014-04-29 01:35:45 +02:00
Eelco Dolstra
d304b277bd Silence some Hydra evaluation warnings 2014-04-24 15:40:55 +02:00
Peter Simons
c2516c30e3 haskell-git-annex: update to version 5.20140412 2014-04-23 11:17:07 +02:00
Eelco Dolstra
a1af25033a git send-email: Respect $OPENSSL_X509_CERT_FILE 2014-04-16 18:43:39 +02:00
John Wiegley
cfe42425c3 On Darwin, set NO_APPLE_COMMON_CRYPTO=1 for git builds 2014-04-14 14:53:15 -05:00
Austin Seipp
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
John Wiegley
010132e302 Change several package constraints from linux to unix 
They all build on Darwin.
 2014-04-12 16:01:16 -05:00
Linquize
ab12d10f87 git: Update to 1.9.2 2014-04-10 02:02:59 +02:00
Peter Simons
1682bde4e0 gitAndTools.svn2git: update from 2.2.2 to 2.2.5 2014-04-09 12:41:10 +02:00
Peter Simons
c244d6e1b8 gitAndTools.stgit: update from 0.16 to 0.17.1 2014-04-09 12:41:10 +02:00
Peter Simons
ff49602b17 haskell-git-annex: update to version 5.20140405 2014-04-07 17:06:34 +02:00
Peter Simons
9000db8b1e haskell-git-annex: update to version 5.20140402 2014-04-06 21:53:16 +02:00
Shea Levy
a68c12d35b git: Remove phony not-supported wrappers. 
Fixes #1751
 2014-04-05 18:39:53 -04:00
Evgeny Egorochkin
9b4080b7af mercurialFull: update from 2.9.1 to 2.9.2 2014-04-03 10:28:15 +03:00
Peter Simons
fa62ab13de haskell-git-annex: update to version 5.20140320 2014-03-22 09:04:46 +01:00
Linquize
4e385c272c git: Update to 1.9.1 2014-03-20 15:44:25 +01:00
Eelco Dolstra
36ee5c61c3 Rename git -> git-minimal, git-full -> git 
Since most people probably want the full Git.
 2014-03-11 17:00:17 +01:00
Evgeny Egorochkin
5a92a3a296 cgit: update from 0.10 to 0.10.1 2014-03-08 18:24:16 +02:00
Peter Simons
39175f5117 haskell-git-annex: update to version 5.20140306 2014-03-08 11:27:29 +01:00
Eelco Dolstra
48ce981d13 mercurial: Update to 2.9.1 2014-03-05 11:29:32 +01:00
Peter Simons
aa8ef327e4 gitAndTools.gitflow: update from 1.6.1 to 1.7.0 2014-03-03 11:10:27 +01:00
Peter Simons
97298922e5 gitAndTools.hub: update from 1.11.1 to 1.12.0 2014-03-03 11:10:27 +01:00
Peter Simons
8cd17a8b03 haskell-git-annex: update to version 5.20140227 2014-02-28 13:01:00 +01:00
Vladimír Čunát
fb1028813c subversion: minor bump to fix CVE-2014-0032 2014-02-22 17:04:34 +01:00
Peter Simons
007611cf4b haskell-git-annex: update to version 5.20140221 2014-02-22 09:19:18 +01:00
Bjørn Forsman
534654e118 git: fix typos in comments 2014-02-15 12:05:44 +01:00
William A. Kennington III
bdb842d5eb Move all db4 packages to the default db5 2014-02-15 12:03:02 +01:00
Linquize
68b3fd33a7 git: Update to 1.9.0 2014-02-15 11:19:38 +01:00
Lluís Batlle i Rossell
8f64e74414 Updating fossil to 1.28. 2014-02-11 12:32:48 +01:00
Peter Simons
30e1186a0c haskell-git-annex: update to version 5.20140210 2014-02-10 21:45:43 +01:00
Linquize
5b41db9765 git: update to 1.8.5.4 (close #1714) 2014-02-09 10:06:22 +01:00
Jan Malakhovski
f5de6b8fc8 updates: mr, vcsh and transmission-remote-gtk 
- mr: copy some more stuff to output
- add vcsh package
- transmission-remote-gtk: 1.0.1 -> 1.1.1
 2014-02-06 23:37:53 +00:00
Georges Dubus
b9fe0b8fb1 bazaar: updated to 2.6.0 and fixed ssl bug 
Fixes #1216
 2014-02-05 11:36:48 +01:00
Nixpkgs Monitor
d2451cbce6 mercurialFull: update from 2.8.2 to 2.9 2014-02-04 10:35:20 +01:00
Ricardo M. Correia
61d37c62c3 hub: Update from 1.10.6 -> 1.11.1 2014-02-02 13:42:07 +00:00
Peter Simons
1124a4ab08 haskell-git-annex: update to version 5.20140129 2014-01-30 08:32:41 +01:00
Peter Simons
63ec2bec8f haskell-git-annex: update to version 5.20140127 2014-01-28 14:59:46 +01:00
Eelco Dolstra
2e70c14061 rcs: Update to 5.9.2 2014-01-27 17:58:26 +01:00
Peter Simons
e2a858379d haskell-git-annex: update to version 5.20140116 2014-01-26 00:02:33 +01:00
Peter Simons
ff8cffed86 subversion: fix evaluation errors on FreeBSD 2014-01-22 12:44:49 +01:00
Vladimír Čunát
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
Bjørn Forsman
1e3289efb4 cgit: fix snapshot feature by using full paths to gzip/bzip2/xz 2014-01-19 22:59:51 +01:00
Bjørn Forsman
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
Bjørn Forsman
8c25a73def cgit: update from 0.9.2 to 0.10 2014-01-19 22:12:12 +01:00
Bjørn Forsman
2b74a47006 gource: fix build 
gource currently fails in the configure phase:

  configure: error: Could not link against -lGLU !

This is a very misleading error, it seems to happen because configure
doesn't find boost libraries and ends up with uninitialized variable(s).
That in turn cause it to fail later with this unrelated error.

Fix by using boost libraries, not only the headers. gource also grew a
dependency on GLM, so add that to buildInputs.
 2014-01-18 19:05:33 +01:00
Vladimír Čunát
0a58b512cb Merge master into stdenv-updates 
Conflicts (simple):
	pkgs/development/compilers/gcc/4.8/default.nix
	pkgs/development/compilers/llvm/default.nix
	pkgs/development/libraries/gmp/5.1.1.nix
	pkgs/development/libraries/gmp/5.1.3.nix
	pkgs/development/libraries/gmp/5.1.x.nix
	pkgs/top-level/all-packages.nix
 2014-01-18 14:46:20 +01:00
Peter Simons
3988e0ca51 gource: mark as broken 
The configure process finds libGLU just fine, but then aborts saying:

  configure: error: Could not link against -lGLU !
 2014-01-16 10:25:04 +01:00