3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

1002 commits

Author SHA1 Message Date
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
Robin Gloster 3f4caa111f
scrypt: remove obsolete substituteInPlace 2016-08-27 21:55:19 +00:00
Joachim F 9003f9d9a1 Merge pull request #18017 from joachifm/tor-0_2_8_7
tor: 0.2.7.6 -> 0.2.8.7
2016-08-27 10:44:39 +02:00
Joachim Fasting c4dc998b69
chaps: fix build against glibc 2.24
Ignore errors due to using deprecated readdir_r(3).
2016-08-26 23:52:19 +02:00
Joachim Fasting 5a2dbb1b8b
tor: 0.2.7.6 -> 0.2.8.7
Also:
- Turn patchPhase into postPatch
- Add systemd and libcap on linux (and also pkgconfig for detection);
  we should be able to change the service unit to Type=notify
- Disable checks for now, the test-suite is failing in sandbox due to
  lack of network
2016-08-26 17:18:56 +02:00
Lancelot SIX 9ed6e8a01d
gnupg21: Removes previously backported patch
fix-gpgsm-linking.patch was backported from gnupg master for 2.1.14. It
is included in 2.1.15, making the patch un applicable.

Fixes 447207d21d
2016-08-25 12:26:22 +02:00
Franz Pletz 447207d21d gnupg: 2.1.14 -> 2.1.15 2016-08-25 01:55:43 +02:00
J Phani Mahesh fefa2749a5 duo-unix: 1.9.11 -> 1.9.19
Closes NixOs/nixpkgs#17911
2016-08-24 22:56:38 +05:30
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
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
Luca Bruno 4916c11ec2 Merge pull request #17898 from RamKromberg/fix/vala_namespace
remove vala namespace
2016-08-21 20:31:44 +01:00
Ram Kromberg 7d393440df gencfsm: vala -> vala_0_23 2016-08-21 20:18:54 +03:00
Luca Bruno cccdbf0bfd crunch: init at 3.6 2016-08-21 17:58:56 +01:00
Chris Williams 602d325342 gnupg: change 1compat platform to unix 2016-08-20 12:07:28 -04:00
Lancelot SIX 6a1e9d253d
gnupg1orig: 1.4.20 -> 1.4.21
Fixes CVE-2016-6316.

See http://lists.gnu.org/archive/html/info-gnu/2016-08/msg00008.html
2016-08-18 10:02:49 +02:00
Joachim Fasting cb5a2acaa1
torbrowser: 6.0.2 -> 6.0.4
Tested briefly on x86_64-linux

Closes: https://github.com/NixOS/nixpkgs/issues/17750
2016-08-17 20:53:47 +02:00
Matthew Bauer 20e86e1282 stricat: fix darwin build 2016-08-16 19:25:46 +00:00
Matthew Bauer 0acdc51d0e pcsclite: fix darwin build
needs IOKit
2016-08-16 19:25:43 +00:00
Robin Gloster 33e1c78ae3 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-16 07:54:01 +00:00
Daniel Peebles 65ed79a1e8 Merge pull request #17642 from svend/gnupg21-fix-gpgsm-linking
gnupg: Fix gpgsm linking for gnupg 2.1.14
2016-08-15 14:19:19 -04:00
Svend Sorensen ac2836610d gnupg: Add comment about when to drop fix-gpgsm-linking.patch 2016-08-15 11:16:55 -07:00
Robin Gloster 3fa7ef49d5 gnupg21: remove unnecessary substituteInPlace
`substituteInPlace` was operating on a non-existant file.
2016-08-14 22:55:21 +00:00
Robin Gloster afbeda22d5 fail2ban: remove unnecessary substituteInPlace
`substituteInPlace` was operating on non-existant files.
2016-08-14 22:55:21 +00:00
Frederik Rietdijk e4b47de694 Remove top-level pycrypto
See #11567.
2016-08-14 14:28:26 +02:00
Frederik Rietdijk 7986b718f3 Remove pycairo from top-level
See #11567.
2016-08-14 13:52:42 +02:00
Franz Pletz bd4490e277 Merge branch 'master' into hardened-stdenv 2016-08-13 16:59:55 +02:00
Luca Bruno e36c239897 Merge pull request #17669 from cheecheeo/shc
shc: init at 3.9.3
2016-08-12 21:51:47 +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
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
John Chee 17a9109b34 shc: init at 3.9.3 2016-08-11 20:56:11 +00:00
Vladimír Čunát b523c1deb9 thc-hydra: fix the tarball job
Darwin has no `stdenv.glibc`.
2016-08-11 19:16:45 +02:00
Nikolay Amiantov 1d726ace0c thc-hydra: 7.5 -> 8.2 2016-08-11 13:49:25 +03:00
Svend Sorensen 092b6b68a0 gnupg: Fix gpgsm linking for gnupg 2.1.14
gnupg 2.1.14 fails to compile under OS X due to a missing -lintl flag [1].
This was fixed in commit c49c43d7 in the gnupg repository [2], which adds
the flag to Makefile.am.

This commit adds the flag to Makefile.in.

[1] https://lists.gnupg.org/pipermail/gnupg-devel/2016-July/031354.html
[2] https://lists.gnupg.org/pipermail/gnupg-devel/2016-July/031362.html

Fixes #17617.
2016-08-10 11:24:23 -07:00
Franz Pletz c66814d9ce nmap: 7.01 -> 7.12 2016-08-07 16:52:07 +02:00
Benno Fünfstück 51aee89740 kbfs: init 2016-08-06 17:20:23 +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 63de40099f treewide: Move some meta sections to end-of-file
That seems to be the overwhelming convention.
2016-08-02 21:17:44 +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 59ce911810 treewide: Some EOF-whitespace fixes 2016-08-02 21:17:44 +03:00
Robin Gloster 1be4907ca2 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-02 13:46:36 +00:00
Joachim Fasting 9e2937ca65 afl: 2.10b -> 2.23b
Looks like mostly performance enhancements and stability fixes.  The main
user facing changes appear to be:

- The -Z option was removed
- A macro named FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION is defined when
    compiling with afl-gcc

Full changelog at http://lcamtuf.coredump.cx/afl/ChangeLog.txt
2016-08-02 07:38:00 +02:00
Frederik Rietdijk 0a1703ba27 hash-slinger: fix evaluation 2016-08-01 10:19:55 +02:00
Frederik Rietdijk 8f9326ffd8 Merge pull request #17323 from arpa2/hashslinger
Hash-slinger: init at  2.7.0
2016-08-01 09:57:12 +02:00
Michiel Leenaars 55904aa5c4 hash-slinger: init at 2.7.0 2016-08-01 09:51:33 +02:00
Robin Gloster 63c7b4f9a7 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-31 20:51:34 +00:00