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
Rickard Nilsson
f25006bfaf
google-cloud-sdk: 113.0.0 -> 122.0.0
2016-08-24 13:19:38 +02:00
obadz
0e8d2725dc
Merge branch 'master' into staging
2016-08-23 18:50:06 +01:00
Tuomas Tynkkynen
b61fbf3132
treewide: Fix output references to openssl
2016-08-23 04:53:27 +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
Ram Kromberg
363fac7da7
gtk-vnc: vala -> vala_0_23
2016-08-21 20:17:14 +03:00
Franz Pletz
bd4490e277
Merge branch 'master' into hardened-stdenv
2016-08-13 16:59:55 +02: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
Robin Gloster
1b979d8384
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-08-03 13:34:44 +00:00
Franz Pletz
e55aa50175
simp_le: apply patch to update TOS hash
...
Fixes #17455 .
Also see https://github.com/kuba/simp_le/issues/114 .
2016-08-02 21:21:02 +02:00
Robin Gloster
5185bc1773
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-07-15 14:41:01 +00:00
Zack Piper
bd1e99a5ed
lxd: 2.0.0.rc4 -> 2.0.2
2016-06-19 20:21:03 +01:00
Robin Gloster
8031cba2ab
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-06-10 09:27:04 +00:00
Rickard Nilsson
548a136345
google-cloud-sdk: 109.0.0 -> 113.0.0
2016-06-10 09:07:01 +00:00
Kamil Chmielewski
7eb671ebcd
no more goPackages
2016-06-09 13:08:00 +02:00
Kamil Chmielewski
a1f3808e2f
lxd: extracted from goPackages
2016-06-09 11:21:30 +02:00
Robin Gloster
2d382f3d98
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-05-30 19:39:34 +00:00
Franz Pletz
d580b0ac0c
simp_le: needs acme 0.5.0
2016-05-22 22:47:52 +02:00
Tobias Geerinckx-Rice
9414e2d536
certbot: 0.5.0 -> 0.6.0; rename from letsencrypt
2016-05-21 13:52:28 +02:00
Joachim Fasting
488de71921
Merge pull request #15433 from zimbatm/google-gloud-sdk-109
...
google-cloud-sdk: 106.0.0 -> 109.0.0
2016-05-18 19:09:52 +02:00
Franz Pletz
f8d481754c
Merge remote-tracking branch 'origin/master' into hardened-stdenv
2016-05-18 17:10:02 +02:00
Domen Kožar
b49bf121b8
rename iElectric to domenkozar to match GitHub
2016-05-17 13:00:47 +01: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
zimbatm
0208e92577
google-cloud-sdk: 106.0.0 -> 109.0.0
2016-05-13 12:48:04 +01:00
Vladimír Čunát
6c2fbfbd77
Merge branch 'master' into staging
2016-05-12 04:53:38 +02:00
zimbatm
89675e4a07
Merge pull request #15371 from groxxda/bump/simp_le
...
simp_le: 2016-02-06 -> 2016-04-17
2016-05-10 22:17:29 +01:00
Alexander Ried
988b151fa1
letsencrypt: 0.4.0 -> 0.5.0
...
seems like the dependency on gnureadline is more or less optional for
letsencrypt itself but the tests will not pass without it
2016-05-10 22:16:11 +01:00
Alexander Ried
8335c68543
simp_le: 2016-02-06 -> 2016-04-17
...
suports acme 0.5
2016-05-10 21:54:21 +02:00
Robin Gloster
9820cb1bf2
use dontBuild instead of hacks
...
changes:
* buildPhase = "true"
* buildPhase = ":"
2016-05-04 10:11:04 +00:00
Robin Gloster
c92bca56f8
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-05-02 22:58:02 +00: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
Joachim Fasting
0f9058365a
Merge pull request #12521 from zopa/master
...
google-cloud-sdk: Add various modules to python path
2016-04-22 22:35:59 +02:00
Arseniy Seroka
9a1a6a0c0c
Merge pull request #14865 from moretea/update_google_sdk
...
google-cloud-sdk: 0.9.82 -> 106.0.0
2016-04-21 19:04:11 +03:00
Maarten Hoogendoorn
dbd88d8778
google-cloud-sdk: 0.9.82 -> 106.0.0
2016-04-21 11:45:05 +02:00
Robin Gloster
d020caa5b2
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-04-18 13:49:22 +00:00
Kevin Cox
08a035725f
daemontools: init at 0.76 ( #14675 )
2016-04-14 01:32:52 +01:00
Michael Raskin
c2d9c35ebd
tigervnc: fix build by adding dependencies
2016-04-13 15:21:11 +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
Robin Gloster
bbbaccfa68
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-04-04 15:24:52 +00:00
Aneesh Agrawal
270c0eb097
salt: init at 2015.8.8
...
Also init salttesting at 2015.7.10 as a build dependency.
2016-04-02 19:37:38 -04: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
Robin Gloster
3f45f0948d
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-03-15 01:44:24 +00:00
Svein Ove Aas
4b998c1f94
simp_le: 2016-01-09 -> 2016-02-06
2016-03-11 12:43:46 +00: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
cb3d27df93
Merge remote-tracking branch 'origin/master' into hardened-stdenv
2016-03-05 18:55:30 +01: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
zimbatm
5f4417e0cf
pythonPackages.acme_0_1: init at 0.1.0
...
`acme_0_1` is introduced because `simp_le` strictly depends on version 0.1.0
of the library (which is now at 0.4.0).
2016-03-03 18:47:02 +00:00
Robin Gloster
d47857c3d9
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-03-01 21:09:17 +00:00
Robin Gloster
3477e662e6
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-02-27 00:08:08 +00:00
Benjamin Staffin
8104b8ff1d
letsencrypt: 0.1.0 -> 0.4.0
...
Closes #12123
2016-02-26 18:03:07 +00:00