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
Frederik Rietdijk
11d1fdfd8b
Remove top-level cython and cython3
...
See #11567 .
2016-08-14 12:01:09 +02:00
Franz Pletz
bd4490e277
Merge branch 'master' into hardened-stdenv
2016-08-13 16:59:55 +02:00
Luca Bruno
c8ca30fe2a
Merge pull request #17247 from lucas8/yadm
...
yadm: init at 1.04
2016-08-12 22:08:29 +01:00
zimbatm
c2302f2f45
Merge pull request #17677 from kamilchm/no-go-libs-json
...
buildGoPackage: remove Go deps file `libs.json`
2016-08-12 18:13:29 +01:00
Miguel Madrid
bd20aaa767
diff-so-fancy: 0.10.1 -> 0.11.1 ( #17691 )
2016-08-12 15:12:29 +02:00
Robin Gloster
b7787d932e
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-08-12 09:46:53 +00:00
Kamil Chmielewski
da3ddd48e4
buildGoPackage: remove Go deps file libs.json
...
After #16017 there were a lot
of comments saying that `nix` would be better than `JSON`
for Go packages dependency sets.
As said in https://github.com/NixOS/nixpkgs/pull/16017#issuecomment-229624046
> Because of the content-addressable store, if two programs have the
> same dependency it will already result in the same derivation in
> the
> store. Git also has compression in the pack files so it won't make
> much difference to duplicate the dependencies on disk. And finally
> most users will just use the binary builds so it won't make any
> differences to them.
This PR removes `libs.json` file and puts all package dependencies in
theirs `deps.json`.
2016-08-11 23:07:09 +02:00
lucas8
3f6d3faf1e
yadm: using fetchFromGitHub
2016-08-06 23:59:54 +02:00
Franz Pletz
c39b6025d8
gitlab: 8.5.12 -> 8.10.3, update module
...
Fixes #14795 .
2016-08-04 02:29:44 +02:00
Robin Gloster
da1a6f4490
Merge pull request #17491 from phile314/git-lfs-update
...
git-lfs: 2016-06-7 -> 1.3.1
2016-08-03 23:51:43 +02:00
Philipp Hausmann
d94ec6ce14
git-lfs: 2016-06-7 -> 1.3.1
2016-08-03 22:36:01 +02:00
Robin Gloster
1b979d8384
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-08-03 13:34:44 +00:00
Tuomas Tynkkynen
21f17d69f6
treewide: Add lots of meta.platforms
...
Build-tested on x86_64 Linux & Mac.
2016-08-02 21:42:43 +03:00
Tuomas Tynkkynen
2258b21e4b
treewide: Add lots of platforms to packages with no meta
...
Build-tested on x86_64 Linux and on Darwin.
2016-08-02 21:17:44 +03:00
Tuomas Tynkkynen
1bf5ded193
treewide: Lots of meta.hydraPlatforms -> meta.platforms
...
In all of these files, there is no meta.platforms but only
meta.hydraPlatforms, which doesn't seem to have any purpose except being
inconsistent.
2016-08-02 21:17:44 +03:00
Franz Pletz
b0d748e244
bitkeeper: disable fortify hardening
2016-08-02 17:49:08 +02:00
Robin Gloster
63c7b4f9a7
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-07-31 20:51:34 +00:00
lucas8
849414f276
yadm: init at 1.04
2016-07-30 11:40:37 +02:00
mimadrid
83251cdd60
meld: 3.16.1 -> 3.16.2
2016-07-30 11:06:22 +02:00
mimadrid
59caf069a4
git: 2.9.1 -> 2.9.2
2016-07-29 11:28:31 +02:00
Bjørn Forsman
e7ef33c50a
git: fix gitweb.cgi breakage due to missing CGI.pm
...
CGI.pm was removed from Perl core in v5.22, breaking the gitweb.cgi
script and thus NixOS' services.lighttpd.gitweb. Nixpkgs switched to
Perl 5.22 with a85ba820a4
("perl: Make 5.22 the default").
Fix it by bringing in the Perl CGI module (and dependency HTMLParser).
The closure size of "nix-build -A git" increase by 1 MiB, to 201 MiB.
2016-07-26 15:20:24 +02:00
Robin Gloster
f222d98746
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-07-25 12:47:13 +00:00
Peter Simons
641fc0e683
haskell: remove all but the latest LTS package sets (version 6.7)
...
This is the first step towards dropping Stackage support. We keep LTS 6.x
around because I don't want to downgrade our default compiler to GHC 7.x,
but once LTS 7.x comes out we'll switch our main package set to that and
drop Nightly.
More details are at:
http://permalink.gmane.org/gmane.linux.distributions.nixos/20505
Closes https://github.com/NixOS/nixpkgs/issues/14897 .
Also relevant:
- https://github.com/NixOS/nixpkgs/issues/16130
- https://github.com/commercialhaskell/stack/issues/2259
2016-07-21 14:41:44 +02:00
Robin Gloster
203846b9de
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-07-19 10:37:02 +00:00
Austin Seipp
cf63016f06
nixpkgs: build bitkeeper only on linux
...
The OS X build fails due to the dependency on 'crypt' failing. Perhaps
in future versions of BitKeeper this build can be re-enabled.
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2016-07-18 19:59:18 +00:00
Wayne Scott
af056de900
nixpkgs: add bitkeeper-7.3ce
...
Closes #16928 .
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2016-07-18 05:22:18 -05:00
Nikolay Amiantov
aefd8c420c
Merge pull request #17043 from womfoo/fix/qmake4Hook-builds
...
reintroduce qmake .pro files after qmake4Hook changes
2016-07-18 00:11:24 +04:00
Miguel Madrid
1b9f6732c7
diff-so-fancy: 0.10.0 -> 0.10.1 ( #17033 )
2016-07-17 17:53:51 +02:00
Kranium Gikos Mendoza
2d529cfebb
guitone: fix qmake4Hook build
...
pass guitone.pro which was removed in 9a8a4b6
2016-07-17 22:41:34 +08:00
Robin Gloster
5185bc1773
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-07-15 14:41:01 +00:00
mimadrid
8c09317018
git: 2.9.0 -> 2.9.1
2016-07-13 15:43:49 +02:00
mimadrid
beec2ba127
diff-so-fancy: 0.9.3 -> 0.10.0
2016-07-05 22:54:14 +02:00
Shea Levy
6857424cf3
src: bump
2016-06-28 10:25:15 -04:00
zimbatm
de45c8d674
Merge pull request #16504 from cko/gitAndTools_git-extras
...
git-ant-tools.git-extras: 3.0.0 -> 4.1.0
2016-06-25 23:18:07 +01:00