Tim Steinbach
7611525c00
git: 2.11.1 -> 2.12.0
2017-02-26 16:18:42 -05:00
Thomas Tuegel
0ed156a216
Merge pull request #22977 from ttuegel/triage-kde4
...
Remove KDE 4 desktop packages
2017-02-25 12:21:44 -06:00
Franz Pletz
ae1c0add81
git-dit: fix evaluation
...
cc @Profpatsch
2017-02-25 11:48:22 +01:00
Profpatsch
e1656bc46d
git-dit: init at 0.1.0
2017-02-25 10:18:43 +01:00
Thomas Tuegel
1336b8dcc9
Remove kde4.kdesvn
...
- No upstream activity
2017-02-24 16:49:04 -06:00
Florent Becker
0a840d4f41
pijul: remove
...
This version is not working, and it is not even a release upstream
2017-02-21 15:34:28 +01:00
Franz Pletz
c302cb4910
gitlab: 8.16.4 -> 8.16.6
2017-02-20 21:53:17 +01:00
Florent Becker
47cb2a9f3e
monotone-viz: fix build with ocaml 4.02+
2017-02-19 13:05:45 +01:00
Michael Raskin
c731738ecc
graphviz_2_0: hide inside monotoneViz
...
The old Graphviz version is vulnerable, but monotone-viz will never feed
it bad input.
2017-02-15 15:10:00 +01:00
Eelco Dolstra
314dd9215b
Merge pull request #16654 from awakenetworks/parnell/setcap-wrappers
...
Adding setcap-wrapper functionality to Nix
2017-02-14 16:25:06 +01:00
Tristan Helmich
8d853d0190
gitlab: 8.16.3 -> 8.16.4
2017-02-14 11:16:36 +01:00
Parnell Springmeyer
9e36a58649
Merging against upstream master
2017-02-13 17:16:28 -06:00
Changlin Li
f6dd263d42
bfg-repo-cleaner: init at 1.12.15
2017-02-12 01:53:08 -05:00
Tim Steinbach
c1e7832591
git: 2.11.0 -> 2.11.1
2017-02-03 18:54:35 -05:00
Peter Hoeg
3d16d69b40
qgit: 2.5 -> 2.6 ( #22360 )
...
Also:
- build the qt5 version by default instead of qt4
- use cmake
2017-02-02 02:55:47 +01:00
Franz Pletz
e07f1f2066
gitlab: 8.16.1 -> 8.16.3
2017-01-30 21:40:18 +01:00
Robert Helgesson
41a0d05872
git-hub: 0.10 -> 0.11.0
...
Includes fixes for CVE-2016-7793 and CVE-2016-7794.
2017-01-29 17:04:57 +01:00
Parnell Springmeyer
4aa0923009
Getting rid of the var indirection and using a bin path instead
2017-01-29 04:11:01 -06:00
Parnell Springmeyer
e92b8402b0
Addressing PR feedback
2017-01-28 20:48:03 -08:00
Parnell Springmeyer
a26a796d5c
Merging against master - updating smokingpig, rebase was going to be messy
2017-01-26 02:00:04 -08:00
Parnell Springmeyer
bae00e8aa8
setcap-wrapper: Merging with upstream master and resolving conflicts
2017-01-25 11:08:05 -08:00
Graham Christensen
04ae7febc8
cvs: patch against CVE-2012-0804 (heap overflow)
2017-01-25 07:24:19 -05:00
Franz Pletz
c9d5e5b34b
gitlab: 8.15.4 -> 8.16.1
2017-01-24 21:29:06 +01:00
Daiderd Jordan
66c0b9d292
Merge pull request #19361 from schneefux/gogs
...
gogs: init at v0.9.97
2017-01-20 20:47:38 +01:00
Franz Pletz
9b92a07843
treewide: use lib.maintainers for meta.maintainers
2017-01-20 15:44:28 +01:00
Jörg Thalheim
202b953c92
bitbucket-server-cli: use gemdir
2017-01-18 00:52:54 +01:00
Jörg Thalheim
dd91891bd9
gitlab: use gemdir
2017-01-18 00:52:52 +01:00
Franz Pletz
6e079bdd60
gitlab: 8.13.5 -> 8.15.4
2017-01-15 17:27:28 +01:00
Matthias Beyer
7adf2ff42e
git-crecord: init at 20161216.0
2017-01-15 14:23:59 +01:00
Eric Bailey
a0e5cbbd6a
hub: 2.2.8 -> 2.2.9
2017-01-09 19:10:18 -06:00
schneefux
3a1da126a1
gogs: 0.9.7 -> 0.9.113
2017-01-07 14:35:20 +01:00
Frederik Rietdijk
f70f898dae
Merge pull request #21710 from peterhoeg/f/gitup
...
git-up: not a python package
2017-01-06 20:51:44 +01:00
Peter Hoeg
98c9db00d8
git-up: not a python package
...
1. git-up is a python package as such but an application, so move it out of python-packages.nix
2. get rid of the tests (we've already run the tests)
2017-01-06 18:56:26 +08:00
Aaron Bull Schaefer
196eb75b88
transcrypt: 1.0.0 -> 1.0.1
2017-01-05 16:20:45 -08:00
jgertm
52a7b6549f
bitbucket-server-cli: init at 0.7.0 ( #21616 )
2017-01-05 10:21:06 +00:00
Aaron Bull Schaefer
e98bd77ef3
transcrypt: 0.9.9 -> 1.0.0
2017-01-01 11:49:22 -08:00
Rushmore Mushambi
b86d256e9c
Merge pull request #21489 from retrry/master
...
rustc, cargo, rustRegistry updates
2016-12-31 04:01:16 +02:00
Joachim Fasting
f2c5bc6d7d
cvsps: use standard install phase
2016-12-30 20:27:27 +01:00
Joachim Fasting
2516472050
cvsps: fetch patches from debian 2.1-7 sources
2016-12-30 20:27:20 +01:00
Joachim Fasting
b4c5916e85
cvsps: get source from Debian, fix build
...
The cobite.com urls seem to have disappeared or been moved. I've failed
to find where they might have gone, so use debian's mirrored sources
instead.
2016-12-30 20:27:17 +01:00
Vladimír Čunát
dbde4eb465
gitAndTools.qgitGit: remove
...
It's rather old and abandoned, the source is dead, and our stable qgit
version seems more recent. /cc @MarcWeber.
2016-12-30 12:30:35 +01:00
Tadas Barzdzius
d27a658846
pijul: mark as broken
2016-12-29 09:57:39 +02:00
Bjørn Forsman
bef30f322f
cgit: 0.12 -> 1.1
2016-12-27 15:46:22 +01:00
Frederik Rietdijk
48fa032aae
Merge pull request #21322 from mimadrid/update/meld-3.16.4
...
meld: 3.16.2 -> 3.16.4
2016-12-21 00:09:27 +01:00
mimadrid
8021c1f429
meld: 3.16.2 -> 3.16.4
2016-12-20 23:56:29 +01:00
Graham Christensen
2d249e206e
Merge pull request #21146 from NeQuissimus/subversion
...
Subversion: 1.9.4 -> 1.9.5; 1.8.16 -> 1.8.17
2016-12-14 17:45:50 -05:00
Tim Steinbach
1edf95167a
subversion: 1.8.16 -> 1.8.17
2016-12-14 09:35:10 -05:00
Tim Steinbach
b139b17fa8
subversion: 1.9.4 -> 1.9.5
2016-12-14 09:30:31 -05:00
bnikolic
88f53c989e
bazaar: enable sftp transport ( #21132 )
...
SFTP transport needs python paramiko package, which is now an optional
input
2016-12-14 15:03:54 +01:00
schneefux
e6ab60dee8
gogs: 20160304-d57a2b9 -> 0.9.97
2016-12-10 14:48:16 +01:00
Kamil Chmielewski
6101eb2454
gogs: FIX public
and templates
use from bin
2016-12-10 14:48:10 +01:00
Valérian Galliat
5a7d267ec3
Gogs: use new go2nix and goPackages
format
...
Introduced with #16017 .
2016-12-10 14:48:03 +01:00
Valérian Galliat
688e6e099a
Gogs: init at 20160227-d320915
2016-12-10 14:47:56 +01:00
Chris Martin
18ee6b9a6d
git-bz: add pycrypto dependency ( #21013 )
2016-12-08 22:59:53 -05:00
Tim Steinbach
f1a0cadaec
git: 2.10.2 -> 2.11.0
2016-11-29 18:37:24 -05:00
Tuomas Tynkkynen
8a4d6516ee
Merge remote-tracking branch 'upstream/staging' into master
2016-11-30 00:34:23 +02:00
Graham Christensen
076e3ae32c
gitRepo: 1.22 -> 1.23
2016-11-28 14:48:49 -05:00
Vladimír Čunát
925b335607
Merge branch 'master' into staging
2016-11-26 11:27:09 +01:00
Frederik Rietdijk
3cd2ca2751
tortoisehg: use python2
2016-11-24 22:28:03 +01:00
Frederik Rietdijk
6be672a7cd
tailor: use python2
2016-11-24 22:28:03 +01:00
Frederik Rietdijk
f1fbf04162
gitinspector: use python2
2016-11-24 22:28:02 +01:00
Frederik Rietdijk
643b12221a
stgit: use python2
2016-11-24 22:28:02 +01:00
Frederik Rietdijk
bea967016e
git-hub: use python2
2016-11-24 22:28:02 +01:00
Frederik Rietdijk
24a495b7a6
cvs2svn: use python2
2016-11-24 22:28:02 +01:00
montag451
278196e854
git-annex-remote-rclone: init at 0.4
2016-11-23 21:06:21 +01:00
Graham Christensen
5d7f2a40a8
cvs: disable fortify hardening
2016-11-22 07:53:50 -05:00
montag451
d212fc99f4
git-remote-gcrypt: 20140715 -> 1.0.0 ( #20623 )
2016-11-22 03:46:26 +01:00
Alex Dunn
80bff0b459
git: link git-credential-netrc into $out/bin
2016-11-19 13:36:30 -08:00
Vladimír Čunát
5af7b82336
Merge branch 'master' into staging
...
To incorporate some larger security rebuilds (jasper).
2016-11-17 11:14:05 +01:00
Tim Steinbach
ef4a335be4
git: 2.10.1 -> 2.10.2
2016-11-15 18:05:02 -05:00
Vladimír Čunát
b5e89fe9bf
Merge branch 'master' into staging
2016-11-15 00:20:19 +01:00
Franz Pletz
b15409d6f6
gitlab: 8.12.8 -> 8.13.5
2016-11-10 06:23:58 +01:00
Austin Seipp
e79264002a
nixpkgs: bitkeeper 7.3ce -> 7.3.1ce
...
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2016-11-10 03:45:51 +00:00
Karn Kallio
9b06e35d33
fossil scm version patch
...
The attached patch advances the version of the fossil expression in
Nixpkgs to the latest release 1.36
From fdd5d610e35eed355f5f3fec9d3675aa60f36292 Mon Sep 17 00:00:00 2001
From: Karn Kallio <kkallio@skami.org>
Date: Tue, 8 Nov 2016 20:23:22 -0400
Subject: [PATCH] fossil : advance to version 1.36
2016-11-09 10:15:22 -05:00
Frederik Rietdijk
559864a951
meld: use python2
2016-11-08 22:48:55 +01:00
Franz Pletz
a7d35fdff3
gitlab: 8.12.6 -> 8.12.8, fix CVE-2016-9086
...
https://about.gitlab.com/2016/11/02/cve-2016-9086-patches/
2016-11-03 20:18:05 +01:00
Frederik Rietdijk
a01d7d131e
mercurial: use mkPythonDerivation
...
since we don't want to use `--prefix PYTHONPATH` since it leaks
PYTHONPATH.
2016-10-31 16:54:33 +01:00
Tim Steinbach
d8e6f48eee
Merge pull request #19978 from k0ral/nixos-unstable
...
mercurial, tortoisehg: 3.9.1 -> 3.9.2
2016-10-29 17:14:45 -04:00
koral
c9ba92c317
tortoisehg: 3.9.1 -> 3.9.2
2016-10-29 23:09:55 +02:00
koral
fc3eec69a0
mercurial: 3.9.1 -> 3.9.2
2016-10-29 23:03:30 +02:00
Jascha Geerds
6de23f466b
gitAndTools.gitflow: 1.10.0 -> 1.10.2
2016-10-29 15:59:07 +02:00
Jaakko Luttinen
6d5b96482a
yadm: 1.04 -> 1.05
2016-10-29 15:40:02 +03:00
Frederik Rietdijk
e56832d730
Merge remote-tracking branch 'upstream/master' into HEAD
2016-10-22 17:23:24 +02:00
Vladimír Čunát
4d5b893002
Merge #19081 : gnome-3.22
...
Also master commits are brought in.
2016-10-20 23:04:10 +02:00
Frederik Rietdijk
c431f11d1f
gitAndTools.git-hub: use python2
...
imports urllib2
2016-10-18 23:16:04 +02:00
Frederik Rietdijk
9ab90824d3
bazaarTools: use python2 and refactor expression
2016-10-18 23:14:33 +02:00
Frederik Rietdijk
2c4fbe30fe
bazaar: use python 2
2016-10-18 23:14:33 +02:00
Frederik Rietdijk
9b68f4272c
git-cola: 2.5 -> 2.8
2016-10-17 22:11:33 +02:00
derchris
cfb843b9a9
gource: 0.43 -> 0.44
2016-10-17 15:14:28 +02:00
zimbatm
13293d108d
Merge pull request #19459 from dipinhora/git-osxkeychain
...
git: enable credential-osxkeychain for darwin
2016-10-16 12:03:31 +01:00
Franz Pletz
9df6c89a6e
gitlab: 8.12.1 -> 8.12.6
2016-10-14 17:34:29 +02:00
Eelco Dolstra
811b876fab
Revert "openssl, curl, git: Respect $NIX_SSL_CERT_FILE"
...
This reverts commit 942dbf89c6
. Sorry,
this was supposed to go to staging instead of master...
2016-10-14 16:01:54 +02:00
Vladimír Čunát
061758490f
Merge branch 'master' into staging
...
... to get the openssl mass rebuild: 942dbf89c
.
2016-10-14 13:16:11 +02:00
Eelco Dolstra
942dbf89c6
openssl, curl, git: Respect $NIX_SSL_CERT_FILE
...
$NIX_SSL_CERT_FILE overrides $SSL_CERT_FILE, which in turn overrides
the default CA path (/etc/ssl/certs/ca-certificates.crt). This allows
Nix to set a CA path without interfering with other packages (such as
Homebrew).
See https://github.com/NixOS/nix/issues/921 .
2016-10-14 12:06:10 +02:00
Vladimír Čunát
6eeea6effd
Python: more evaluation fixups.
2016-10-14 00:03:12 +02:00
Frederik Rietdijk
efb6052f40
Python: fixup modules that were removed
2016-10-13 22:11:30 +02:00
Frederik Rietdijk
cffdffe1f6
Merge pull request #19309 from FRidh/outputs
...
Python: use separate output for tkinter
2016-10-13 10:40:14 +02:00
romildo
83d25e490b
smartgithg: 7_1_2 -> 8_0_3
2016-10-12 20:15:35 -03:00
Jascha Geerds
19c42ee0b7
gitAndTools.gitflow: 1.9.1 -> 1.10.0
2016-10-11 23:38:29 +02:00
dipinhora
641a1e433a
git: enable credential-osxkeychain for darwin
2016-10-11 15:25:08 -04:00
Frederik Rietdijk
104c50dd1a
Python: remove modules and pythonFull
2016-10-10 10:33:24 +02:00
Joachim F
9270aa6677
Merge pull request #19388 from cko/git-extras
...
git-extras: 4.1.0 -> 4.2.0
2016-10-09 14:08:13 +02:00
Robin Gloster
30accf4d3e
treewide: fix licence -> license occurences
2016-10-09 12:45:32 +02:00
Christine Koppelt
9d85dd7ec0
git-extras: 4.1.0 -> 4.2.0
2016-10-09 12:37:22 +02:00
Frederik Rietdijk
2fb5289d83
git: 2.10.0 -> 2.10.1
2016-10-05 10:37:09 +02:00
Michael Fellinger
c2f6752e01
git-crypt: remove platforms
...
fixes #18811
2016-10-01 00:48:12 +02:00
Graham Christensen
f9c9c1dac8
redmine: mark as broken
...
https://github.com/NixOS/nixpkgs/issues/18856
2016-09-28 08:52:17 -04:00
Franz Pletz
77779323c5
gitlab: 8.11.2 -> 8.12.1
2016-09-27 18:41:02 +02:00
Eelco Dolstra
81447b6a59
subversion: Remove openssl.dev from the runtime closure
2016-09-26 19:58:57 +02:00
Aneesh Agrawal
e6897a3fb4
mercurial: Pin to Python 2
2016-09-26 11:41:54 -04:00
Frederik Rietdijk
9c5610d759
bazaar: use buildPythonApplication
2016-09-26 14:16:18 +02:00
Frederik Rietdijk
3ba16c8234
Do not use top-level buildPythonPackage or buildPythonApplication
...
but instead use the one in pythonPackages.
2016-09-26 11:10:51 +02:00
Frederik Rietdijk
24314edbc8
diffuse: do not use top-level python packages
2016-09-25 23:12:26 +02:00
Thomas Tuegel
1e741cf603
Merge pull request #18926 from PierreR/master
...
vcsh: 1.20141026-1 -> 1.20151229-1
2016-09-24 10:10:24 -05:00
Pierre Radermecker
e9bac709e2
vcsh: 1.20141026-1 -> 1.20151229-1
2016-09-24 16:50:08 +02:00
Tim Steinbach
d965064280
tortoisehg: 3.8.1 -> 3.9.1
2016-09-23 11:51:54 -04:00
Tim Steinbach
18b5e607d9
mercurial: 3.8.2 -> 3.9.1
2016-09-23 11:50:14 -04:00
Damien Cassou
4d15b2cdb0
hub: 2.2.5 -> 2.2.8
2016-09-22 09:26:58 +02:00
Kamil Chmielewski
914e0e594c
buildGoPackage: deps.json -> deps.nix in NIXON
...
https://github.com/NixOS/nixpkgs/pull/17254#issuecomment-245295541
* update docs to describe `deps.nix`
* include goDeps in nix-shell GOPATH
* NixOS 16.09 rel notes about replacing goPackages
2016-09-16 00:04:55 +01:00
Nikolay Amiantov
4748709926
Merge commit 'refs/pull/18498/head' of git://github.com/NixOS/nixpkgs
2016-09-13 12:51:34 +03:00
Domen Kožar
d6a4a30fb1
pijul: build only on 64bit platforms
...
(cherry picked from commit 8479962862
)
Signed-off-by: Domen Kožar <domen@dev.si>
2016-09-13 10:37:55 +02:00
Franz Pletz
fb9117efa6
Merge pull request #18488 from chris-martin/md5-2
...
Miscellaneous packages: Use sha256 instead of md5 (part 2)
2016-09-13 07:11:43 +02:00
Kirill Boltaev
bccd75094f
treewide: explicitly specify gtk and related package versions
2016-09-12 18:26:06 +03:00
Chris Martin
f7c0a9c9cc
kdesvn: md5->sha256
2016-09-10 13:51:20 -04:00
Peter Simons
f649d4eefa
git-annex: fix GHC 8.x build
2016-09-09 13:55:39 +02:00
Aaron Bull Schaefer
598ccfdec9
transcrypt: 0.9.7 -> 0.9.9
2016-09-06 14:55:19 -07:00
J Phani Mahesh
2b86ccbf32
git: 2.9.3 -> 2.10.0
2016-09-03 16:20:32 +05:30
Gabriel Ebner
b6f9f3de46
Merge pull request #18236 from mimadrid/update/hub-2.2.5
...
hub: 2.2.3 -> 2.2.5
2016-09-03 07:35:55 +02:00
mimadrid
307a4650c8
hub: 2.2.3 -> 2.2.5
2016-09-03 00:38:38 +02:00
Frederik Rietdijk
01fafc088a
peru: 0.2.3 -> 1.0.1, fix build
2016-09-02 20:52:26 +02:00
Parnell Springmeyer
98c058a1ee
Adapting everything for the merged permissions wrappers work.
2016-09-01 19:21:06 -05:00
Tuomas Tynkkynen
3364230d56
Disable bunch of non-compiling packages on Darwin
...
These ones have a "Last successful build" timestamp in the 2014s or
2015s. Presumably no one will notice if we now stop building them.
softether_4_18 2015-09-20 http://hydra.nixos.org/build/39418483
lensfun 2014-09-30 http://hydra.nixos.org/build/39394104
net_snmp 2015-09-20 http://hydra.nixos.org/build/39410553
djview 2015-08-11 http://hydra.nixos.org/build/39413233
libmusicbrainz2 2015-09-20 http://hydra.nixos.org/build/39410106
fox_1_6 2014-05-07 http://hydra.nixos.org/build/39410858
libofx 2015-09-24 http://hydra.nixos.org/build/39423507
yacas 2014-09-30 http://hydra.nixos.org/build/39393150
iomelt 2014-09-30 http://hydra.nixos.org/build/39408486
softether 2015-09-20 http://hydra.nixos.org/build/39425800
mp4v2 2014-09-30 http://hydra.nixos.org/build/39421899
virtuoso7 2014-09-21 http://hydra.nixos.org/build/39415206
man_db 2015-04-23 http://hydra.nixos.org/build/39404236
libdiscid 2014-09-30 http://hydra.nixos.org/build/39412202
zabbix22.agent 2014-09-21 http://hydra.nixos.org/build/39412149
vidalia 2015-08-06 http://hydra.nixos.org/build/39411500
libmtp 2015-09-20 http://hydra.nixos.org/build/39419199
wxGTK29 2015-09-20 http://hydra.nixos.org/build/39415296
ncmpcpp 2015-11-06 http://hydra.nixos.org/build/39404455
libtorrent 2014-09-21 http://hydra.nixos.org/build/39394646
shishi 2014-03-21 http://hydra.nixos.org/build/39418874
ocaml_3_12_1 2014-09-30 http://hydra.nixos.org/build/39392996
djview4 2015-08-11 http://hydra.nixos.org/build/39427799
vimNox 2014-05-23 http://hydra.nixos.org/build/39397012
ttfautohint 2015-08-06 http://hydra.nixos.org/build/39398330
libraw 2015-09-24 http://hydra.nixos.org/build/39402271
wxGTK30 2015-09-20 http://hydra.nixos.org/build/39401871
sbcl_1_2_5 2015-09-20 http://hydra.nixos.org/build/39426091
prover9 2014-09-30 http://hydra.nixos.org/build/39406476
rcs 2015-08-25 http://hydra.nixos.org/build/39392037
gpac 2015-09-24 http://hydra.nixos.org/build/39399470
virtuoso6 2014-09-30 http://hydra.nixos.org/build/39398651
xlslib 2015-09-24 http://hydra.nixos.org/build/39410387
ucommon 2015-03-27 http://hydra.nixos.org/build/39414040
commoncpp2 2014-09-30 http://hydra.nixos.org/build/39420117
virtuoso 2014-09-21 http://hydra.nixos.org/build/39399978
miniHttpd 2014-09-30 http://hydra.nixos.org/build/39392925
mpack 2014-09-26 http://hydra.nixos.org/build/39399535
nbd 2014-09-26 http://hydra.nixos.org/build/39401367
newsbeuter-dev 2014-07-29 http://hydra.nixos.org/build/39406259
gimp_2_8 2015-09-20 http://hydra.nixos.org/build/39436271
gimp 2015-09-20 http://hydra.nixos.org/build/39435976
zabbix20.agent 2014-09-30 http://hydra.nixos.org/build/39393242
gst_all_1.gst-plugins-good 2015-09-20 http://hydra.nixos.org/build/39408506
ocaml_4_00_1 2014-09-30 http://hydra.nixos.org/build/39399526
inadyn 2014-09-30 http://hydra.nixos.org/build/39426389
gst_all_1.gst-plugins-bad 2015-09-20 http://hydra.nixos.org/build/39392970
zabbix.agent 2014-09-30 http://hydra.nixos.org/build/39421412
cmake-2_8 2015-09-24 http://hydra.nixos.org/build/39399443
liblastfm 2015-08-06 http://hydra.nixos.org/build/39421812
newsbeuter 2014-07-29 http://hydra.nixos.org/build/39396605
sdcv 2014-09-26 http://hydra.nixos.org/build/39412928
2016-09-01 20:39:33 +03:00
Tuomas Tynkkynen
048a30e4e4
treewide: Fix dev references to libxml2
2016-08-30 03:02:32 +03:00
Tuomas Tynkkynen
a17216af4c
treewide: Shuffle outputs
...
Make either 'bin' or 'out' the first output.
2016-08-29 14:49:51 +03:00
obadz
3de6e5be50
Merge branch 'master' into staging
...
Conflicts:
pkgs/applications/misc/navit/default.nix
pkgs/applications/networking/mailreaders/alpine/default.nix
pkgs/applications/networking/mailreaders/realpine/default.nix
pkgs/development/compilers/ghc/head.nix
pkgs/development/libraries/openssl/default.nix
pkgs/games/liquidwar/default.nix
pkgs/games/spring/springlobby.nix
pkgs/os-specific/linux/kernel/perf.nix
pkgs/servers/sip/freeswitch/default.nix
pkgs/tools/archivers/cromfs/default.nix
pkgs/tools/graphics/plotutils/default.nix
2016-08-27 23:54:54 +01:00
Franz Pletz
d70f83e7e9
gitlab: 8.10.6 -> 8.11.2
2016-08-26 15:03:19 +02:00
Lluís Batlle i Rossell
3aa8f23aec
fossil: update to 1.35
2016-08-25 17:27:55 +02:00
obadz
0e8d2725dc
Merge branch 'master' into staging
2016-08-23 18:50:06 +01:00
Nikolay Amiantov
55d9db7139
gource: fix build
2016-08-22 07:42:36 +03:00
obadz
24a9183f90
Merge branch 'hardened-stdenv' into staging
...
Closes #12895
Amazing work by @globin & @fpletz getting hardened compiler flags by
enabled default on the whole package set
2016-08-22 01:19:35 +01:00
Peter Simons
bdc38c6a67
Merge pull request #17829 from mimadrid/update/git-2.9.3
...
git: 2.9.2 -> 2.9.3
2016-08-19 10:16:46 +02:00
mimadrid
7f3a4688f0
git: 2.9.2 -> 2.9.3
2016-08-18 21:13:00 +02:00
Silvio Fricke
dc7c848e10
tig: 2.1.1 -> 2.2
...
Signed-off-by: Silvio Fricke <silvio.fricke@gmail.com>
2016-08-18 16:24:25 +02:00
Franz Pletz
131bc22b84
gitlab service: add option for db_key_base secret
2016-08-17 13:17:47 +02:00
Franz Pletz
b070a9c439
gitlab: 8.10.3 -> 8.10.6
2016-08-17 05:36:24 +02:00
Frederik Rietdijk
5a501bd828
Remove top-level dbus_python and pythonDBus.
...
See #11567 .
Furthermore, it renames pythonPackages.dbus to pythonPackages.dbus-
python as that's the name upstream uses.
There is a small rebuild but I couldn't figure out the actual cause.
2016-08-16 22:52:37 +02:00
Frederik Rietdijk
6d75bf842b
mercurial: pass in pythonPackages
2016-08-16 11:48:09 +02:00
Robin Gloster
33e1c78ae3
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-08-16 07:54:01 +00:00
Frederik Rietdijk
7986b718f3
Remove pycairo from top-level
...
See #11567 .
2016-08-14 13:52:42 +02:00
Frederik Rietdijk
57b9ff06f1
Remove top-level pylint
...
See #11567 .
2016-08-14 13:07:26 +02:00