Commit Graph

12970 Commits

Author SHA1 Message Date
Frederik Rietdijk
d38ee5b46c Merge remote-tracking branch 'upstream/master' into HEAD 2017-09-07 09:29:44 +02:00
Frederik Rietdijk
a3e524054f mitmproxy: fix build
which was broken after the cryptography bump to 2.x.

cc maintainer @fpletz
2017-09-07 09:28:03 +02:00
Frederik Rietdijk
d45e554457 mycli: move out of python-packages.nix and fix build 2017-09-07 09:28:03 +02:00
Frederik Rietdijk
b00be43cdf gmvault: fix build 2017-09-07 09:28:03 +02:00
Peter Hoeg
90433ed831 diffoscope: 77 -> 85 2017-09-07 09:28:03 +02:00
Daiderd Jordan
3cb57304de Merge pull request #29045 from matthewbauer/pinentry-no-fill-plist
pinentry-mac: no ‘fill plist’ stuff
2017-09-06 21:11:18 +02:00
Frederik Rietdijk
9e27b88141 Merge remote-tracking branch 'upstream/master' into HEAD 2017-09-06 20:17:53 +02:00
Robin Gloster
993a83d395
tcpdump: 4.9.1 -> 4.9.2
This is a security release theoretically under emgargo, but leaked by
Mageia and Fedora.

We have permission to deliver this prior to public release.
2017-09-06 16:42:43 +02:00
Frederik Rietdijk
38dc9a870f Merge remote-tracking branch 'upstream/master' into HEAD 2017-09-06 14:01:25 +02:00
Frederik Rietdijk
67651d80bc Merge pull request #28884 from FRidh/python-fixes
Python: several fixes
2017-09-06 13:54:10 +02:00
Matthew Bauer
7f860249e1
pinentry-mac: no ‘fill plist’ stuff
fixes #26774
2017-09-05 22:35:00 -05:00
John Ericson
40e917d35d Merge pull request #29023 from obsidiansystems/deps-reorg
misc pkgs: Reorganize dependencies ahead of #26805
2017-09-05 18:10:32 -04:00
Daiderd Jordan
8706664ff6
afl: use clangStdenv
Fixes #28712
2017-09-05 22:00:44 +02:00
Franz Pletz
84ec7ef6c3
file: 5.31 -> 5.32 for CVE-2017-1000249 2017-09-05 20:22:01 +02:00
Franz Pletz
bbeeee220a
Merge remote-tracking branch 'origin/master' into staging 2017-09-05 20:14:08 +02:00
John Ericson
252b36a28d misc pkgs: Recategorize some dependencies 2017-09-05 11:37:10 -04:00
Gabriel Adomnicai
7c08e86be9 mmake: init at 1.2.0 (#28904)
* Package for mmake

* Package for mmake - build from sources

* Package name update

* Added maintainers
2017-09-05 15:00:22 +01:00
Franz Pletz
00a9902297
at: 3.1.16 -> 3.1.20 2017-09-05 14:24:57 +02:00
Franz Pletz
a46f206271
tcpdump: fix multiple CVEs
Fixes CVE-2017-11541, CVE-2017-11542, CVE-2017-11543.

Also fixes a segfault if built with openssl 1.1.
2017-09-05 13:10:13 +02:00
Franz Pletz
f8ff9a783f
aptly: 1.0.1 -> 1.1.1 2017-09-05 13:10:13 +02:00
Franz Pletz
a5e9a31fb5
advancecomp: 1.23 -> 2.0 2017-09-05 13:10:13 +02:00
Franz Pletz
7753daa204
connman: 1.34 -> 1.35
Fixes CVE-2017-12865, see http://connmando.nri-secure.co.jp/index.html.

Fixes #28967.
2017-09-05 11:58:58 +02:00
Frederik Rietdijk
c7be7c54e8 Merge pull request #28884 from FRidh/python-fixes
Python: several fixes
2017-09-05 11:16:41 +02:00
Jörg Thalheim
f91b4de9c2 Merge pull request #28993 from catern/patch-1
offlineimap: add Kerberos support
2017-09-05 09:31:30 +01:00
Frederik Rietdijk
d7ef196c26 Merge remote-tracking branch 'upstream/master' into HEAD 2017-09-05 10:11:06 +02:00
Peter Hoeg
62ff6cb69c netalyzr: init at 57861 2017-09-05 08:12:40 +08:00
Jörg Thalheim
73c6284c2e mitmproxy: unicode locales, skip network test 2017-09-04 22:47:42 +01:00
catern
b5eb923bc7 offlineimap: add Kerberos support 2017-09-04 15:55:24 -04:00
Tuomas Tynkkynen
5f8e6a4fe1 tpm-tools: 1.3.8 -> 1.3.9.1, fixes build 2017-09-04 19:15:27 +03:00
Dan Peebles
550c5c9b3f coreutils: fix on Darwin
This patch doesn't apply because it's already applied upstream
2017-09-04 12:04:12 -04:00
John Ericson
0a944b345e Merge pull request #28557 from obsidiansystems/binutils-wrapper
Binutils-wrapper: Init by refactoring out of cc-wrapper
2017-09-03 10:37:27 -04:00
Vladimír Čunát
37242d98de
Merge branch 'master' into staging 2017-09-03 10:51:11 +02:00
Vladimír Čunát
828bc3812c
texlive: add ghostscript when containing pdfcrop
Potential disadvantage: ghostscript will become visible to user,
so there may e.g. be (new) collisions in nix-env due to this.
Fixes #28411.
2017-09-03 10:17:37 +02:00
Joachim F
829a2e81d3 Merge pull request #28890 from disassembler/irods-icommands
irods-icommands: 4.2.0 -> 4.2.1
2017-09-03 07:45:56 +00:00
Michael Raskin
491f5be49b Trying a less disruptive patch for Cuneiform 2017-09-02 18:53:06 +02:00
Tim Steinbach
1c45fd01aa
coreutils: 8.27 -> 8.28 2017-09-02 11:11:19 -04:00
Samuel Leathers
5fb93524b3 irods-icommands: 4.2.0 -> 4.2.1 2017-09-02 10:52:02 -04:00
Frederik Rietdijk
72cc6ba17f ansible_2_1, ansible_2_2: use overridePythonAttrs 2017-09-02 13:55:59 +02:00
Jörg Thalheim
8d015553d5 ansible_2_2/ansible_2_1: switch to overrideDerivation for jinja2 2017-09-02 13:55:59 +02:00
Frederik Rietdijk
d0dab8a330 Merge remote-tracking branch 'upstream/master' into HEAD 2017-09-02 11:10:52 +02:00
Jörg Thalheim
7b20952c04 Merge pull request #28726 from vyp/interception-tools
interception-tools: init at 0.1.1
2017-09-02 08:24:57 +01:00
xd1le
e0b44a09b8 interception-tools: init at 0.1.1
The latest release of libyamlcpp in nixpkgs does not build because it
uses an older version of boost than the one in nixpkgs and therefore
expects a particular header file which does not exist in the latest
boost anymore. For this reason, a later (git) version of libyamlcpp is
used here (which actually doesn't even require boost).

The substituteInPlace in the prePatch phase is needed because libevdev
places its headers in non-standard places, meaning Nix cannot normally
find them. The `cut` command removes the first two "-I" characters from
the output of `pkg-config`. This needs to be in the prePatch phase
because otherwise Nix will patch these lines to `/var/empty`, meaning
you would have less specific replacement (in case other lines are also
patched to `/var/empty`).

I wrote the patch. (I believe it is NixOS specific.)
2017-09-02 16:17:53 +10:00
Samuel Leathers
917a0e3e77 glmark2: 2016-05-11 -> 2017-09-01 2017-09-01 22:01:24 -04:00
aszlig
40b76c8809
beets: Run tests for external plugins
In order to run the tests for the external plugins of beets, we need to
have beets itself as a dependency. So in order to do that, we now pass
beets without plugins and tests to the nativeBuildInputs of the plugins
so that we can run them.

As soon as the plugins are built they become part of the final beets,
which also has tests enabled, so disabling the tests for beets
derivation that is used for external plugin tests is a non-issue here
because they're going to be executed anyway.

Enabling tests for the alternatives plugin is pretty straightforward,
but in order to run tests for the copyartifacts plugin, we need to bump
the source code to the latest Git master.

The reason for this is that the version that was in use until now
required to have the beets source directory alongside of the
copyartifacts source code, but we already have beets available as a
normal dependency.

Updating copyartifacts to latest master largely consists of unit test
changes and a few Python 3 compatibility changes. However, one change
has the biggest stat, which is
sbarakat/beets-copyartifacts@1a0c281da0.

Fortunately, the last change is just moving the implementation to a
newer API from upstream beets and by the looks of the implementation it
seems to break support for moving files. However, reverting this commit
also reveals that moving files was already broken before, so it wouldn't
matter much whether we have this version bump or not.

Tested with the following command:

nix-build -E '(import ./. {}).beets.override {
  enableAlternatives = true;
  enableCopyArtifacts = true;
}'

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @domenkozar, @pjones, @Profpatsch, @michalrus
2017-09-02 02:36:32 +02:00
aszlig
bd2aeb4883
beets-alternatives: Disable test suite for now
Regression introduced by 94351197cd.

Running the tests results in the following traceback:
  ...
  File ".../unittest/loader.py", line 91, in loadTestsFromName
    module = __import__('.'.join(parts_copy))
  File ".../test/regrtest.py", line 184, in <module>
    for module in sys.modules.itervalues():
RuntimeError: dictionary changed size during iteration

The reason for this is that the test directory itself is called "test"
and the package including regrtest.py is also called "test", so the
loader tries to load tests from its own implementation.

We could fix this by changing PYTHONPATH and/or making the test
directory a proper package, but we'd still have failing tests because
beets itself is required to run the tests.

However for now I'm just removing the unit_tests kwarg in setup.py so
that we have the same behaviour as before the initially mentioned
commit.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2017-09-02 02:36:28 +02:00
Michael Raskin
cc44675dfc Merge pull request #28855 from danielfullmer/john-compile-fix
john: workaroud for build failure
2017-09-01 21:55:28 +02:00
Joachim F
189797c795 Merge pull request #28840 from romildo/upd.uget
uget: 2.0.8 -> 2.0.10
2017-09-01 18:20:00 +00:00
John Ericson
b298916442 rpm: Fix to get raw binutils for headers 2017-09-01 11:44:57 -04:00
John Ericson
3f30cffa55 misc pkgs: Use $NIX_BINUTILS for when needed
Certain files are now only there instead of $NIX_CC (some are in both)
2017-09-01 11:44:55 -04:00
Daniel Fullmer
28b1170f49 john: workaroud for build failure 2017-09-01 11:05:01 -04:00