Commit Graph

254 Commits

Author SHA1 Message Date
Frederik Rietdijk
6b724f069b cli53: use python2 2016-10-18 23:16:07 +02:00
Aneesh Agrawal
1d9a98cae0 salt: use Python 2 2016-10-18 23:14:36 +02:00
Eelco Dolstra
69bb34673e Merge pull request #19196 from groxxda/xkbbindir
xserver: replace XKB_BINDIR with compile time option
2016-10-03 17:12:59 +02:00
Alexander Ried
e7ded267bd xserver: replace XKB_BINDIR with compile time option
---

Using the configure option relieves us of the patch and passing the path
via the env var in many places. Also the env var may not be inherited
when components like gdm spawn new sessions.
2016-10-03 15:03:02 +02:00
Alexander Ried
da658b98ce gtk-vnc: 0.5.3 -> 0.6.0
gtk3 build is now default
2016-10-01 17:14:31 +02:00
Alexander Ried
ecd80b9a0e gtk-vnc: remove gtk2 support (unused) 2016-10-01 17:14:31 +02:00
Aneesh Agrawal
7b7d8ddbca salttesting: remove unused package
It was added as a dependency of Salt, which no longer depends on it.
2016-09-27 13:34:22 -04:00
Frederik Rietdijk
982ac542cb cli53: do not pass in buildPythonApplication 2016-09-26 11:10:51 +02:00
Frederik Rietdijk
d07270649c gtk-vnc: do not use top-level python packages 2016-09-25 23:19:40 +02:00
Aneesh Agrawal
34b5d639c6 SaltTesting: 2015.7.10 -> 2016.9.7 2016-09-23 20:33:36 -04:00
Aneesh Agrawal
f61b23cd23 salt: 2015.8.8 -> 2016.3.3 2016-09-23 20:31:20 -04: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
Kirill Boltaev
bccd75094f treewide: explicitly specify gtk and related package versions 2016-09-12 18:26:06 +03:00
Parnell Springmeyer
98c058a1ee Adapting everything for the merged permissions wrappers work. 2016-09-01 19:21:06 -05:00
Tuomas Tynkkynen
c3bcb4e1ce treewide: Use explicit 'dev' references to glibc 2016-08-30 03:11:09 +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
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
Frederik Rietdijk
4d06bf70f4 buildPythonApplication: use new function for Python applications 2016-02-19 13:16:41 +01:00
Vladimír Čunát
d039c87984 Merge branch 'master' into closure-size 2016-02-14 08:33:51 +01:00
Robin Gloster
9229e9c656 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-02-07 11:17:57 +00:00
Vladimír Čunát
ae74c356d9 Merge recent 'staging' into closure-size
Let's get rid of those merge conflicts.
2016-02-03 16:57:19 +01:00
Robin Gloster
d43078b15b webdruid: remove
It used the old builderDefsPackage and segfaulted on startup. Could not
fix it and has not been touched for 6 years.
2016-01-30 20:31:02 +00:00
Robin Gloster
f6d3b7a2ae switch hardening flags 2016-01-30 16:36:57 +00:00
Franz Pletz
954e9903ad Use a hardened stdenv by default 2016-01-30 16:36:57 +00:00
Tobias Geerinckx-Rice
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
Ben Doyle
af847a68bd google-cloud-sdk: Add various modules to PYTHONPATH
This fixes a sequence of missing-module errors seen when calling
`gcloud auth authenticate-service-acount`.
2016-01-21 06:57:06 -05:00
Vladimír Čunát
716aac2519 Merge branch 'staging' into closure-size 2016-01-19 09:55:31 +01:00
Tobias Geerinckx-Rice
8c5ef127f4 simp_le: 20151207 -> 2016-01-09; co-maintain
CC maintainer @gebner.
2016-01-15 03:49:13 +01:00
Tony White
3a4aa2a109 tigervnc: prevent nix store collison
- Prevent store collison with the xserver for two files
- Stop gcc from complaining at build time about C and CXX flags
- Enable parallel building for this expression
- Move to the new way of calling Xorg and it's dependencies
2016-01-14 06:31:30 +00:00
Christoph Hrdinka
32a36e8a6a tigervnc: git-20150504 -> 1.6.0 2016-01-12 22:36:15 +01:00
Vladimír Čunát
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
Nikolay Amiantov
adc693f982 simp_le: 20151205 -> 20151207 2015-12-12 16:06:51 +01:00
Luca Bruno
5b0352a6a4 Merge branch 'master' into closure-size 2015-12-11 18:31:00 +01:00
Frederik Rietdijk
b2d9b48c97 python awscli: move to python-packages.nix 2015-12-11 11:28:32 +01:00
Gabriel Ebner
7cc6e6718c simp_le: init at 20151205, fixes #11479 2015-12-05 23:09:47 +01:00
Gabriel Ebner
51bcfbe007 pythonPackages.acme: extract from letsencrypt derivation. 2015-12-05 23:09:27 +01:00
roblabla
67fda15a89 letsencrypt: 0.0.0.dev20151123 -> 0.1.0 2015-12-04 15:39:58 +01:00
Dan Peebles
60f949bc78 awscli: fix broken dependency
Sorry, not sure how I missed this in my earlier commit!
2015-12-03 08:25:29 -05:00
Dan Peebles
8a84a80193 awscli: 1.7.47 -> 1.9.6
Also updates its botocore dependency from 1.1.10 to 1.3.6 and makes it
use requests2 instead of requests.
2015-12-03 08:23:29 -05:00
Luca Bruno
a412927924 Merge remote-tracking branch 'origin/master' into closure-size 2015-11-25 21:37:30 +01:00
Domen Kožar
344e96fe0e letsencrypt: 0.0.0.dev20151030 -> 0.0.0.dev20151123 2015-11-25 10:40:26 +01:00
Vladimír Čunát
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
Pascal Wittmann
7fd2796e99 Replace 'with plaforms; platform' with 'platforms.platform' 2015-11-17 21:30:43 +01:00
Samuel Rivas
21488c6e60 botocore: 1.1.10 -> 1.2.0
Keep the old version as awscli depends on it
2015-11-09 22:18:20 +01:00
Domen Kožar
7207dd8f1a typo 2015-10-31 22:05:12 +01:00
Domen Kožar
b8d9a16eec letsencrypt: add 0.0.0.dev20151030 2015-10-31 22:01:20 +01:00
Rickard Nilsson
321a6b2248 google-cloud-sdk: 0.9.74 -> 0.9.82 2015-10-20 12:15:00 +02:00
Vladimír Čunát
12487536d2 libgpgerror: split dev and info outputs 2015-10-13 20:19:00 +02:00
Vladimír Čunát
21e3ff658a x11: replace its usage by xlibsWrapper directly
Scilab note: the parameters already had pointed to nonexistent dirs
before this set of refactoring. But that config wasn't even used by
default.
2015-09-15 12:08:24 +02:00
Mathnerd314
eb7404d97a all-packages: Use callPackage where possible 2015-09-14 22:27:19 -06:00
Daniel Brockman
8828a174cb awscli: 1.7.41 -> 1.7.47
People in #nixos told me to switch from fetchzip to fetchFromGitHub;
let me know if that's a bad change.
2015-09-03 13:51:08 +02:00
Rickard Nilsson
30313a8fb8 google-cloud-sdk: 0.9.65 -> 0.9.74 2015-08-26 02:03:13 +02:00