Commit graph

2510 commits

Author SHA1 Message Date
Tuomas Tynkkynen
3a762ef967 shadowsocks-libev: Fix 'lib.optional' use
Produces buildInputs having lists of lists.
2016-08-30 23:00:13 +03:00
Tuomas Tynkkynen
c3bcb4e1ce treewide: Use explicit 'dev' references to glibc 2016-08-30 03:11:09 +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
Graham Christensen
8d10928ad0 Merge pull request #17908 from Mic92/ferm
Ferm
2016-08-25 20:38:02 -04:00
Jörg Thalheim
7b354ce8cc
ferm: init at 2.3 2016-08-25 21:37:19 +02:00
Franz Pletz
62c72e9af7 dhcpcd: 6.10.1 -> 6.11.3 2016-08-25 01:43:54 +02:00
Jaka Hudoklin
bb21c377e7 Merge pull request #17651 from leenaars/argus
Argus + Argus-clients: init at 3.0.8.2
2016-08-24 23:48:20 +02:00
Robin Gloster
d8679e4957 easyrsa: use autoreconfHook 2016-08-24 20:18:52 +00:00
Robin Gloster
0e1b611a5b flannel: disable fortify hardening 2016-08-24 19:00:11 +00: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
Michiel Leenaars
378c7a26af argus-clients: init at 3.0.8.2 2016-08-24 00:13:38 +02:00
obadz
8da8aa7ddb Merge branch 'hardened-stdenv' into staging 2016-08-23 18:50:10 +01:00
obadz
0e8d2725dc Merge branch 'master' into staging 2016-08-23 18:50:06 +01:00
Joachim Fasting
8ab400988c lsh: fix gcc5 build
The build fails with c11 (also tested c99), but works with gnu90.
2016-08-23 15:33:32 +00:00
Robin Gloster
7413278f9b Revert "Remove lsh, broken & unmaintained"
This reverts commit 73f4c2bdf8.
2016-08-23 15:32:41 +00:00
Zero King
04d7056514 mosh: 1.2.5 -> 1.2.6 (#17939) 2016-08-23 14:49:57 +00:00
zimbatm
320367c273 wrk: 4.0.0 -> 4.0.2 2016-08-23 10:40:03 +01:00
Eelco Dolstra
f2e496a9d8 Merge pull request #17935 from DamienCassou/offlineimap-7.0.6
offlineimap: 7.0.5 -> 7.0.6
2016-08-23 11:26:54 +02:00
Damien Cassou
d829298570 offlineimap: 7.0.5 -> 7.0.6 2016-08-23 10:47:55 +02:00
Tuomas Tynkkynen
df4ebf5f1a treewide: Fix output references to gnome3.gtk 2016-08-23 04:53:01 +03:00
Tuomas Tynkkynen
f46a48384a treewide: Make explicit that 'dev' output of readline is used 2016-08-23 03:52:07 +03:00
Tuomas Tynkkynen
dba79aa395 treewide: Make explicit that 'dev' output of bind is used 2016-08-23 03:45:22 +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
Michiel Leenaars
4d2ef926b5 argus: init at 3.0.8.2 2016-08-22 22:17:14 +02: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
obadz
ba50fd7170 Merge branch 'master' into staging 2016-08-22 01:18:11 +01:00
Ram Kromberg
a0ff1c7824 ccnet: vala -> vala_0_23 2016-08-21 20:17:25 +03:00
Nikolay Amiantov
0b05a16070 wget: fix man pages 2016-08-21 18:25:54 +03:00
obadz
68936edfb3 Merge branch 'master' into staging 2016-08-21 12:03:41 +01:00
J Phani Mahesh
049f5e44e2 srelay: switch sf downloads to mirror://
This allows fallback to all configured mirrors for sourceforge
to download, instead of relying on just downloads.sourceforge.net
2016-08-20 19:14:31 +05:30
Joachim Fasting
ba0f9cfa49
Revert "Merge pull request #16980 from phanimahesh/sf-use-mirrors"
This reverts commit 217594fd1d, reversing
changes made to 8e8a89d8a8.

Turns out it wasn't ready afterall ...
2016-08-20 15:14:23 +02:00
J Phani Mahesh
a466257b1d srelay: switch sf downloads to mirror:// 2016-08-20 17:31:37 +05:30
Nikolay Amiantov
821e5c95b4 networkmanager098: fix binary paths 2016-08-19 17:57:04 +03:00
Nikolay Amiantov
1b8806098a networkmanager: point to kmod's modprobe 2016-08-19 17:56:59 +03:00
Nikolay Amiantov
ff22705793 treewide: replace several /sbin paths by /bin 2016-08-19 17:56:45 +03:00
Franz Pletz
b4cc9bd63a Merge remote-tracking branch 'origin/master' into hardened-stdenv
Fixes #17801 and #17802.
2016-08-17 19:43:43 +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
f6903292fc tlsdate: dont build on darwin
There was a typo previously adding these in.
2016-08-16 19:25:45 +00:00
Robin Gloster
33e1c78ae3 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-16 07:54:01 +00:00
Shea Levy
9adad8612b Revert "Merge branch 'modprobe-fix' of git://github.com/abbradar/nixpkgs"
Was meant to go into staging, sorry

This reverts commit 57b2d1e9b0, reversing
changes made to 760b2b9048.
2016-08-15 19:05:52 -04:00
Nikolay Amiantov
b067b53011 networkmanager098: fix binary paths 2016-08-16 00:19:26 +03:00
Nikolay Amiantov
cd05a8ed00 networkmanager: point to kmod's modprobe 2016-08-16 00:19:26 +03:00
Nikolay Amiantov
1afd250676 treewide: replace several /sbin paths by /bin 2016-08-16 00:19:25 +03:00
Nikolay Amiantov
fc7e8bd96e networkmanager: fix ExecReload in the service 2016-08-14 22:38:50 +03:00
Nikolay Amiantov
49fe339b09 update-resolv-conf: 20141003 -> 2016-04-24 2016-08-14 22:37:11 +03:00
Nikolay Amiantov
bd8217a2bc logmein-hamachi: 2.1.0.139 -> 2.1.0.165 2016-08-14 22:37:06 +03:00
Frederik Rietdijk
7986b718f3 Remove pycairo from top-level
See #11567.
2016-08-14 13:52:42 +02:00