Commit graph

3154 commits

Author SHA1 Message Date
Tuomas Tynkkynen 8c4aeb1780 Merge staging into master
Brings in:
    - changed output order for multiple outputs:
      https://github.com/NixOS/nixpkgs/pull/14766
    - audit disabled by default
      https://github.com/NixOS/nixpkgs/pull/17916

 Conflicts:
	pkgs/development/libraries/openldap/default.nix
2016-09-01 13:27:27 +03:00
Tuomas Tynkkynen 43cf6f944a zabbix: Use dev outputs of libc 2016-09-01 00:28:32 +03:00
rushmorem ac26d8ff43 rethinkdb: 2.3.4 -> 2.3.5 2016-08-31 15:15:08 +02:00
Domen Kožar 557b329608 dictd-db: get rid of builderDefs #4210 2016-08-31 10:41:25 +02:00
Tuomas Tynkkynen c4521aeffa xcb-util-xrm: Fix 'lib.optional' usage
That produces a list containing a singleton list containing libX11.
2016-08-30 16:28:02 +03:00
Tuomas Tynkkynen d3dc3d4130 Merge remote-tracking branch 'dezgeg/shuffle-outputs' into staging
https://github.com/NixOS/nixpkgs/pull/14766
2016-08-30 12:43:37 +03:00
Tuomas Tynkkynen c3bcb4e1ce treewide: Use explicit 'dev' references to glibc 2016-08-30 03:11:09 +03:00
Tuomas Tynkkynen 048a30e4e4 treewide: Fix dev references to libxml2 2016-08-30 03:02:32 +03:00
Tuomas Tynkkynen d4eb6887b9 xorg.xf86videoati: Use dev output of xorgserver
TODO: Darwin xorgserver should have consistent outputs with the Linux
one.
2016-08-30 02:41:12 +03:00
Vladimír Čunát 40dc278ee0 xorg.fontbhttf: mark as unfree
https://bugzilla.redhat.com/show_bug.cgi?id=317641
2016-08-29 22:40:32 +02:00
Vladimír Čunát 4f73633f26 treewide: stop using fontbhttf 2016-08-29 22:28:50 +02:00
Tuomas Tynkkynen a17216af4c treewide: Shuffle outputs
Make either 'bin' or 'out' the first output.
2016-08-29 14:49:51 +03:00
Robin Gloster 0865e22567
xorg.xf86videoxgi: add patch to fix build 2016-08-29 08:25:12 +00: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
Benjamin Saunders 96198d7421 matrix-synapse: 0.17.0 -> 0.17.1 2016-08-26 23:37:18 -07:00
Graham Christensen 6bfe459355 Merge pull request #17983 from ericsagnes/pkg/groonga
groonga: init at 6.0.7
2016-08-25 08:02:08 -04:00
Eric Sagnes 5b8e4e2260 groonga: init at 6.0.7 2016-08-25 17:45:50 +09:00
Franz Pletz afb821fa15 apacheHttpd: use sha256 hash instead of sha1 2016-08-25 03:14:40 +02:00
Franz Pletz 4cb7272537 apacheHttpd: 2.4.20 -> 2.4.23 (security)
Fixes CVE-2016-4979.
2016-08-25 03:10:02 +02:00
Franz Pletz 7897e913f7 redis: 3.2.2 -> 3.2.3 2016-08-25 01:56:36 +02:00
Robin Gloster 4685018b59
freeswitch: 1.2.3 -> 1.6.9 2016-08-24 23:23:03 +00:00
Jaka Hudoklin 6e9c9b25c7 Merge pull request #17890 from schneefux/pflogsumm
pflogsumm: init at 1.1.3
2016-08-24 23:37:54 +02:00
Franz Pletz 35d836660f memcached: disable treating warnings as errors on darwin
PIE hardening is not available on darwin but it's just a warning.
2016-08-24 21:44:41 +02:00
Franz Pletz bfe1c24eac dico: disable format hardening 2016-08-24 20:16:48 +02:00
obadz 78b7529ee3 Merge branch 'master' into staging 2016-08-24 11:57:44 +01:00
Daniel Peebles 3f337a2b23 Merge pull request #17685 from matthewbauer/darwin-misc2
Darwin misc. fixes
2016-08-24 11:52:27 +02:00
obadz 0e8d2725dc Merge branch 'master' into staging 2016-08-23 18:50:06 +01:00
Kranium Gikos Mendoza e130fa5958 openpts: fix build 2016-08-23 12:37:01 +03:00
Tuomas Tynkkynen 2ed167b4e3 treewide: Make explicit that 'dev' output of openssl is used 2016-08-23 04:32:21 +03:00
Tuomas Tynkkynen f6640842fe treewide: Make explicit that 'dev' output of sqlite is used 2016-08-23 03:52:07 +03:00
Tuomas Tynkkynen 2e6b5c41af treewide: Make explicit that 'dev' output of apacheHttpd is used 2016-08-23 03:26:54 +03:00
Tuomas Tynkkynen 8d2875d60a taskserver: Reference correct output of gnutls 2016-08-23 03:20:21 +03:00
Tuomas Tynkkynen 14b8153c28 mod_fastcgi: Make 'apacheHttpd.dev' more explicit 2016-08-23 03:20:21 +03:00
Tuomas Tynkkynen 282277dbc8 treewide: Use more makeBinPath 2016-08-23 01:18:10 +03:00
Tuomas Tynkkynen 74a3a2cd7e treewide: Use makeBinPath 2016-08-23 01:18:10 +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
schneefux 509f24f240
pflogsumm: init at 1.1.3 2016-08-21 21:18:28 +02:00
rushmorem 6e2629d9f2 caddy: 0.9.0 -> 0.9.1 2016-08-21 17:08:33 +02:00
Vladimír Čunát ab95a3ff7f xorg xf86-video-amdgpu: init at 1.1.0
Fixes #17682, closes #17857.
The resulting binary is the same as in the PR,
but this uses auto-generated expression with override.
2016-08-21 11:32:26 +02:00
Tristan Helmich 8bfc760e8b emby: 3.0.6060 -> 3.0.6070 2016-08-20 09:37:25 +02:00
Robert Helgesson 2033f261e9
redstore: add home page and license fields 2016-08-17 22:43:06 +02:00
Robert Helgesson 74b25f4c69
redstore: 0.5.2 -> 0.5.4 2016-08-17 22:34:17 +02:00
Robert Helgesson a4ae7b87f0
redstore: fix build under recent glibc
Previously the build would fail due to, e.g., `getaddrinfo` not being
defined.
2016-08-17 22:34:17 +02:00
Christine Koppelt 75bffa11d6 influxdb: add 1.0.0-beta3 (#17733) 2016-08-17 13:40:05 +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
Matthew Bauer 0c6a79a2d0 mosquitto: use cmake for darwin
Makefile says this:

Please compile using CMake on Mac OS X.
2016-08-16 19:25:43 +00:00
Franz Pletz 2709079569 postgresql: security updates for all versions
Fixes CVE-2016-5423 and CVE-2016-5424.

See https://www.postgresql.org/about/news/1688/.
2016-08-16 18:35:22 +02:00
Robin Gloster 33e1c78ae3 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-16 07:54:01 +00:00
Franz Pletz d2840f94f4 matterircd: init at 0.9.0 2016-08-15 03:31:36 +02:00
Franz Pletz 34bb3a193f mattermost: init at 3.3.0 2016-08-15 03:31:36 +02:00