Commit Graph

1349 Commits

Author SHA1 Message Date
Kamil Chmielewski
ece0626593 git-lfs: extracted from goPackages 2016-06-09 11:21:30 +02:00
Peter Simons
1845843cdd git-annex: take this tool from LTS Haskell while Stackage Nightly is broken 2016-06-06 09:33:30 +02:00
Tuomas Tynkkynen
bac26e08db Fix lots of fetchgit hashes (fallout from #15469) 2016-06-03 17:17:08 +03:00
Kazunori Kajihiro
5c1f0990e3 hub: fix incorrect hash (#15830) 2016-05-30 14:23:32 +01:00
Vladimír Čunát
e4832c7541 Merge branch 'staging'
Includes a security update of libxml2.
2016-05-27 15:58:40 +02:00
Rok Garbas
800de8db21 git: 2.8.0 -> 2.8.3 2016-05-27 14:58:48 +02:00
Vladimír Čunát
81039713fa Merge branch 'master' into staging
... to get the systemd update (rebuilding ~7k jobs).
2016-05-26 16:50:22 +02:00
Michael Raskin
3bf1348bf7 mercurial: 3.8.1 -> 3.8.2 2016-05-25 16:01:43 +02:00
Vladimír Čunát
0b192a0976 Merge branch 'master' into staging
That's to get mesa rebuild from master, as it's nontrivial.
2016-05-23 09:02:10 +02:00
Vladimír Čunát
c4661e9643 Merge: make dev output references explicit
This is a rebase of most commits from #14766,
resolving conflicts and a few other evaluation problems.
2016-05-22 12:09:23 +02:00
Alexander Ried
9e073bd110 subversionClient: fix build with gcc5
fixes #15483
2016-05-20 14:38:14 +02:00
Tuomas Tynkkynen
7fb29bfa73 treewide: Make explicit that 'dev' output of zlib is used 2016-05-19 10:04:38 +02:00
Tuomas Tynkkynen
05d8174b0e treewide: Make explicit that 'dev' output of subversion is used 2016-05-19 10:04:37 +02:00
Tuomas Tynkkynen
e80e4ba2bb treewide: Make explicit that 'dev' output of sqlite is used 2016-05-19 10:04:34 +02:00
Tuomas Tynkkynen
3672f3edcb treewide: Make explicit that 'dev' output of libxslt is used 2016-05-19 10:00:48 +02:00
Tuomas Tynkkynen
29694b43b6 treewide: Make explicit that 'dev' output of apr is used 2016-05-19 10:00:24 +02:00
Tuomas Tynkkynen
16cc4ac83b treewide: Make explicit that 'dev' output of apacheHttpd is used 2016-05-19 10:00:23 +02:00
Pascal Wittmann
8029ee27b6 subversion: 1.9.3 -> 1.9.4 (fixes CVE-2016-2168, CVE-2016-2167) 2016-05-18 21:34:25 +02:00
Pascal Wittmann
032ba2d578 subversion: 1.8.15 -> 1.8.16 (fixes CVE-2016-2168, CVE-2016-2167) 2016-05-18 21:34:25 +02:00
Frederik Rietdijk
197ff2c5aa Merge pull request #15518 from danbst/thg81
tortoisehg: 3.7.3 -> 3.8.1
2016-05-17 14:43:34 +02:00
Domen Kožar
b49bf121b8 rename iElectric to domenkozar to match GitHub 2016-05-17 13:00:47 +01:00
danbst
2f24e11992 tortoisehg: 3.7.3 -> 3.8.1 2016-05-17 14:02:06 +03:00
Peter Simons
8e462995ba Bring my stdenv.lib.maintainers user name in line with my github nick. 2016-05-16 22:49:55 +02:00
Vladimír Čunát
65a9fa8cdc Merge branch 'master' into staging 2016-05-08 21:24:48 +02:00
Andrey Pavlov
f5668437ab hub: 2.2.2 -> 2.2.3 2016-05-06 10:39:29 +03:00
Michael Raskin
9dc5dcf6db mercurial: 3.7.3 -> 3.8.1 2016-05-05 20:30:59 +02:00
Vladimír Čunát
1dc36904d8 Merge #14920: windows improvements, mainly mingw 2016-05-05 08:30:19 +02:00
Robin Gloster
9820cb1bf2 use dontBuild instead of hacks
changes:
 * buildPhase = "true"
 * buildPhase = ":"
2016-05-04 10:11:04 +00:00
Franz Pletz
2acea21155 gitlab: 8.5.7 -> 8.5.12 2016-05-04 01:24:55 +02:00
Tuomas Tynkkynen
aadaa91379 Merge remote-tracking branch 'upstream/master' into staging
Conflicts:
	pkgs/applications/networking/browsers/vivaldi/default.nix
	pkgs/misc/emulators/wine/base.nix
2016-05-03 23:12:48 +03:00
Eelco Dolstra
8a854c2647 Merge pull request #15111 from rardiol/subversionPerl
subversion: fix apr-1 linking related to #14495
2016-05-02 10:56:28 +02:00
zimbatm
6cf44fed13 Merge pull request #15113 from rardiol/gitSVN
git: fix subversion bindings for multiple outputs
2016-05-01 10:10:31 +01:00
Ricardo Ardissone
e5a9d64787 git: fix subversion bindings for multiple outputs 2016-04-30 13:19:14 -03:00
Ricardo Ardissone
025ccbccd7 subversion: fix apr-1 linking 2016-04-30 12:13:26 -03:00
zimbatm
d2b176ace5 Merge pull request #14617 from nathan7/git-ssl-cert-file
git: respect $SSL_CERT_FILE
2016-04-29 23:03:52 +01:00
Tobias Geerinckx-Rice
aa8bc97dd6
git-hub -> gitAndTools.git-hub (with alias) 2016-04-29 21:42:35 +02:00
Tobias Geerinckx-Rice
2415254a52
git-hub: 0.9.0 -> 0.10 2016-04-29 21:42:35 +02:00
Tuomas Tynkkynen
b465dc202f boost: Kill unnecessary 'lib' output
This was split in somewhere pre-2014 without the current infra which
automates parts of this, in particular the output propagation.
2016-04-28 00:41:28 +03:00
Tuomas Tynkkynen
4ff8f377af Merge remote-tracking branch 'upstream/master' into staging 2016-04-28 00:13:53 +03:00
Frederik Rietdijk
d5e6a4494a Python: use PyPI mirror (#15001)
* mirrors: add pypi

* Python: Use pypi mirror for all PyPI packages
2016-04-26 13:38:03 +01:00
Eric Seidel
2177bf3074 fossil: add libiconv on darwin 2016-04-25 09:12:05 -07:00
Nikolay Amiantov
ab0a0c004e makeSearchPathOutputs: refactor to makeSearchPathOutput 2016-04-25 13:24:39 +03:00
Joachim Fasting
f49b9fe9d9 Merge pull request #14892 from danbst/tortoisehg-refactor
tortoisehg: 3.7.1 -> 3.7.3, refactor
2016-04-22 19:05:56 +02:00
danbst
2fce49d3e8 tortoisehg: 3.7.1 -> 3.7.3, refactor
update tortoisehg to 3.7.3 and remove source patch in build expression.
setup.py in TortoiseHG computes wrong paths in `build` phase
(upstream bug https://bitbucket.org/tortoisehg/thg/issues/4483/problems-with-setuppy-on-posix-systems).
So we skip this phase and perform install manually (the `build` phase is still performed as subcommand).
2016-04-22 16:00:43 +00:00
danbst
e36339fd80 mercurial: add comment for maintainers on version bump 2016-04-22 15:59:40 +00:00
Vladimír Čunát
e9379f7416 Merge branch 'staging'
This includes a fix to closure-size regression that moved
share/doc/*/ to share/doc/
2016-04-22 16:49:09 +02:00
Nikolay Amiantov
9a8a4b6efe guitone: move to qmake4Hook 2016-04-20 18:55:48 +03:00
Nikolay Amiantov
e5e09e8cc7 svn2git-kde: move to qmake4Hook 2016-04-20 18:55:48 +03:00
Nikolay Amiantov
9325393959 qgit-git: move to qmake4Hook 2016-04-20 18:55:48 +03:00
Nikolay Amiantov
a4e868a102 qgit: move to qmake4Hook 2016-04-20 18:55:48 +03:00
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
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
Bob van der Linden
318fdda01c git-cola: 2.2.1 -> 2.5 2016-03-30 20:25:50 +02:00
zimbatm
0592eb377e Merge pull request #14207 from zimbatm/git-and-ssh
git: add openssh as a runtime dependency
2016-03-30 10:23:55 +01:00
Louis Taylor
69c6f7e20a git: 2.7.4 -> 2.8.0 2016-03-29 07:21:41 +01:00
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
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
zimbatm
75d7692ab3 gitAndTools.darcsToGit: 0.2git -> 2015-06-04
Fixes error where ruby 2.0+ doesn't have iconv anymore.

    `require': cannot load such file -- iconv (LoadError)
2016-03-05 18:45:39 +00:00
Nathan Zadoks
819dab0203 git-remote-hg: fix the derivation name
-v0.2 isn't parsed as a version by Nix, and makes it inconvenient to
install git-remote-hg through nix-env.
2016-03-03 14:51:31 +01:00
Eelco Dolstra
1c74a16e10 rcs: Fix build on gcc 5
http://hydra.nixos.org/build/32624218
2016-03-03 13:10:22 +01: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
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
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
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