b07e7bfc7b
Merge remote-tracking branch 'origin/staging'
2016-03-27 13:19:04 +01:00
6579acd015
git: add openssh as a runtime dependency
...
Fixes #1923
2016-03-26 14:39:57 +00:00
5db2d9366b
subversion: fix hash
2016-03-21 12:47:54 +02:00
64fe2b5eb6
gitlab: remove unused parameter
2016-03-19 22:04:12 +00:00
31c317e09e
git: 2.7.3 -> 2.7.4
2016-03-18 18:07:33 -07:00
1cd99b1a48
gitlab: 8.5.5 -> 8.5.7
2016-03-17 03:39:16 +01:00
abcf57a8db
git: update from version 2.7.1 to 2.7.3
2016-03-16 21:35:55 +01:00
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
62f47641b1
smartgithg: 7.1.0 -> 7.1.2
...
Also fixes broken download link.
2016-03-14 10:27:22 -04:00
3f9b00c2d8
Merge pull request #13906 from Zer0-/gitlab_version_bump
...
Gitlab version bump
2016-03-14 13:29:13 +01:00
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
bdb1e5c73f
svn: convert sha1 to sha256
2016-03-11 15:54:55 -06:00
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
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
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
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
1c74a16e10
rcs: Fix build on gcc 5
...
http://hydra.nixos.org/build/32624218
2016-03-03 13:10:22 +01:00
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
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
d589391202
gitinspector: 0.4.1 -> 0.4.4
2016-02-28 11:32:09 +01:00
73f6410851
cgit: 0.11.2 -> 0.12 for CVE-2016-1899 CVE-2016-1900 CVE-2016-1901
2016-02-27 15:35:19 -06:00
17348dc094
Remove all dots at end of descriptions
...
Specially crafted for @JagaJaga
find pkgs -name "*.nix" -exec \
sed -e 's|\(description.*\)\.";|\1";|g' -i {} \;
2016-02-27 17:30:29 +00:00
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
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
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
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
428e12d23f
Merge pull request #13154 from zimbatm/git-rebase-fix-v2
...
git: fixes references to gettext properly
2016-02-26 00:03:17 +00:00
fe6ad9e912
git-stree: init at 0.4.5
2016-02-25 15:26:06 -08:00
ca5f243697
git-and-tools: alphabetize attributes before it gets too huge
2016-02-25 14:23:34 -08:00
40c586b7ce
Merge pull request #13427 from k0ral/mercurial
...
mercurial: 3.5.1 -> 3.7.1
2016-02-25 17:00:58 +01:00
d4193c82c1
mercurial: 3.5.1 -> 3.7.1
2016-02-24 16:39:03 +01:00
677893f92b
Merge pull request #13422 from k0ral/git
...
git: 2.7.0 -> 2.7.1
2016-02-24 15:09:28 +01:00
c1504c5a94
git: 2.7.0 -> 2.7.1
2016-02-24 13:47:23 +01:00
40ca841c5c
Merge pull request #13124 from FRidh/buildPythonApplication
...
buildPythonApplication: use new function for Python applications
2016-02-23 16:02:10 +01:00
11733b39b5
git: fixes references to gettext properly
...
A better implementation of 5273dbf530https://github.com/NixOS/nixpkgs/issues/13150
The attached patch removes a whole swath of unnecessary runtime gettext
detection. It also adds gettext on the PATH so that git-rebase can find it.
2016-02-20 14:47:23 +00:00
fd3e02add8
Merge pull request #13027 from puffnfresh/package/pijul
...
pijul: 0.1 -> 0.2-6ab9ba
2016-02-20 15:43:53 +01:00
4d06bf70f4
buildPythonApplication: use new function for Python applications
2016-02-19 13:16:41 +01:00
e9520e81b3
Merge branch 'master' into staging
2016-02-17 10:06:31 +01:00
c38eb526d5
git: fix references to gettext in bash scripts
...
See #13047
2016-02-16 21:01:21 +00:00
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
d039c87984
Merge branch 'master' into closure-size
2016-02-14 08:33:51 +01:00
4538e70661
smartgithg: update 7_0_2 -> 7_1_0
2016-02-10 23:03:15 +01:00
a115bff08c
Merge branch 'master' into staging
2016-02-07 13:52:42 +01:00
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
0d1a188c5d
Re-add Monotone-Viz with Fedora as a source
2016-02-04 20:13:49 +01:00
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
54299b60c4
Merge #12779 : Mass replace `pkg}/bin`-style strings
...
... to refer to correct outputs
2016-02-03 17:25:22 +01:00
ae74c356d9
Merge recent 'staging' into closure-size
...
Let's get rid of those merge conflicts.
2016-02-03 16:57:19 +01:00
9f358f809d
Configure a default trust store for openssl
2016-02-03 12:42:01 +01:00
b70310da23
Merge pull request #12750 from henrytill/mr
...
mr: 1.20150503 -> 1.20160123
2016-02-01 23:47:45 +01:00
e97e690244
treewide: Mass replace 'xz}/bin' to refer the 'bin' output
2016-02-01 20:46:28 +02:00
5f4a8de754
treewide: Mass replace 'bzip2}/bin' to refer the 'bin' output
2016-02-01 20:45:57 +02:00
79b326e9e9
mr: 1.20150503 -> 1.20160123
2016-02-01 11:24:01 -05:00
9d7e2baf3b
viewmtn: remove, source is offline and pkg dead
2016-01-30 20:31:04 +00:00
f295fef411
tailor: refactor from builderDefsPackage
2016-01-30 20:31:04 +00:00
6950c43467
monotoneViz: delete
...
not updated in 5 years and broken build
2016-01-30 20:31:04 +00:00
2c3013f55b
cvs: Remove unneeded configureFlags
2016-01-30 20:31:01 +00:00
f7578a4d32
gitflow: 1.8.0 -> 1.9.1
2016-01-27 17:15:42 +01:00
890f000146
goPackages.git-annex-remote-b2: init at 0.2
2016-01-26 17:54:53 +01:00
9fb8020e4e
Add version attribute where maintainers |= nckx
...
This will probably be mandatory soon, and is a step in the right
direction. Removes the deprecated meta.version, and move some meta
sections to the end of the file where I should have put them in
the first place.
2016-01-25 17:35:21 +01:00
716aac2519
Merge branch 'staging' into closure-size
2016-01-19 09:55:31 +01:00
2d0893088f
Merge branch 'master' into staging
2016-01-15 13:43:57 +01:00
c169718a6b
git-bz: fix meta typo
...
Thanks to @heydojo.
2016-01-15 10:26:18 +01:00
d1440745c6
git-bz: meta: un-break; fix licence; maintain
...
CC @nbp (I assume it was abandoned years ago, apologies otherwise).
2016-01-15 05:31:47 +01:00
36a68c8b6b
git-bz: 3.20110902 -> 3.2015-09-08
2016-01-15 05:31:47 +01:00
123065aa3d
git-bz: use callPackage and canonical package name
...
Don't add a compatibility alias as this package was/is marked as
being broken anyway.
2016-01-15 05:31:47 +01:00
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
2c4c9bee13
git: 2.6.4 -> 2.7.0
...
Also corrected the license, which is GPL2-only
2016-01-05 22:15:17 -08:00
a472d836f6
FreeBSD: apr-util, cyrus-sasl, berkeley db, glib, gnutls, kerberos, libelf-freebsd, openldap, serf, guile, tet, shishi, gawk, gnugrep
2016-01-01 17:01:13 +00:00
f9f6f41bff
Merge branch 'master' into closure-size
...
TODO: there was more significant refactoring of qtbase and plasma 5.5
on master, and I'm deferring pointing to correct outputs to later.
2015-12-31 09:53:02 +01:00
729211de7a
Merge pull request #11917 from jerith666/subgit
...
subgit: init at 3.1.0
2015-12-29 14:57:47 +03:00
090efc2907
subgit: init at 3.1.0
2015-12-28 22:59:23 -05:00
0b6f76a1d3
Merge pull request #11934 from makefu/cvs2svn
...
cvs2svn: 2.0.1 -> 2.4.0
2015-12-25 17:26:43 +03:00
47f17939c2
cvs2nix: 2.0.1 -> 2.4.0
2015-12-24 16:58:01 +01:00
6108bb8971
hub: 2.2.1 -> 2.2.2
2015-12-23 08:37:02 -08:00
e5b15f6b52
Merge pull request #11838 from k0ral/git
...
git: 2.6.3 -> 2.6.4
2015-12-20 11:55:57 +01:00
016e88b2d2
git: 2.6.3 -> 2.6.4
2015-12-19 17:37:37 +00:00
95dc945759
Merge pull request #11774 from ip1981/ip1981/git-crypt
...
git-crypt needs GnuPG
2015-12-17 11:03:27 +01:00
85375fc5fc
git-crypt needs GnuPG
2015-12-17 11:00:50 +03:00
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
64792ffdaa
subversion: Use callPackages
2015-12-16 15:21:58 +01:00
5b0352a6a4
Merge branch 'master' into closure-size
2015-12-11 18:31:00 +01:00
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
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
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
b7a4231aa2
gitlab: 7.4.2 -> 8.0.5
2015-12-04 01:14:24 +01:00
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
920b1d3591
Merge branch 'master' into closure-size
2015-11-29 16:50:26 +01:00
2798b02ad0
Convert some *Flags from strings to lists
2015-11-26 23:45:31 +01:00
a412927924
Merge remote-tracking branch 'origin/master' into closure-size
2015-11-25 21:37:30 +01:00
69e7f3bb74
switch to zero underscores for sandbox profiles; remove generateFrameworkProfile
2015-11-21 12:10:33 -08:00
a63346e33c
use single underscore for sandboxProfile
2015-11-21 11:17:30 -08:00
333d69a5f0
Merge staging into closure-size
...
The most complex problems were from dealing with switches reverted in
the meantime (gcc5, gmp6, ncurses6).
It's likely that darwin is (still) broken nontrivially.
2015-11-20 14:32:58 +01:00
df80090d09
use per-derivation sandbox profiles
2015-11-19 11:31:06 -08:00
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
6602f49495
Revert "Revert "Merge pull request #9543 from NixOS/staging.post-15.06""
...
This reverts commit 741bf840da
2015-11-14 12:32:51 -08:00
9579c9ec7f
Merge commit 'cb21b77' into master.upstream
...
This is a partial merge of staging for builds which are working
2015-11-13 15:53:10 -08:00
221965a918
tig: add libiconv dep on darwin
2015-11-07 13:51:43 +01:00
1e7aa4f17d
Merge branch 'master.upstream' into staging.upstream
2015-11-05 18:30:11 -08:00
ebedbec72b
git: 2.6.2 -> 2.6.3
2015-11-05 18:18:21 -08:00
Domen Kožar
zimbatm
Evgeny Egorochkin
Yann Hodique
Franz Pletz
Peter Simons
joachifm
Raymond Gauthier
Robin Gloster
Philipp Volguine
Graham Christensen
Eelco Dolstra
Vladimír Čunát
Nathan Zadoks
Bjørn Forsman
Benjamin Staffin
koral
Wout Mertens
Frederik Rietdijk
Ricardo M. Correia
Frederik Rietdijk
Brian McKenna
Michael Raskin
Robert Scott
Guillaume Maudoux
Luca Bruno
Tuomas Tynkkynen
Henry Till
Jascha Geerds
Christoph Hrdinka
Tobias Geerinckx-Rice
somaticweb
janus
Arseniy Seroka
Matt McHenry
makefu
Eric Merritt
Igor Pashev
Luca Bruno
Pascal Wittmann
roblabla
Antoine Eiche
Jude Taylor
Philip Lykke Carlsen
William A. Kennington III
Stéphane Jourdois