1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-14 00:25:24 +00:00
Commit graph

127594 commits

Author SHA1 Message Date
Andreas Rammhold 93cf06776e
Merge pull request #34692 from andir/mpv
mpv: fix CVE-2018-6460
2018-02-07 09:15:54 +00:00
Andreas Rammhold 95f4d6ba1c
mpv: fix CVE-2018-6460
Upstream has fixed this in a series of commits ontop of 0.28.0. Debian
has backported the fixes to 0.27.0.

Upstream issue: https://github.com/mpv-player/mpv/issues/5456
Debian bug: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=888654#8
2018-02-07 10:01:16 +01:00
Peter Simons 8ff7ac4859
Merge pull request #34646 from clacke/hledger-darwin
hledger: build correctly on darwin
2018-02-07 08:32:59 +01:00
Peter Simons fa23ff4a7d
Merge pull request #34651 from mnacamura/r-darwin-libcxx
R: add libcxx to default LDFLAGS and CPPFLAGS on Darwin
2018-02-07 08:31:10 +01:00
Peter Simons 725e98fe85
Merge pull request #34682 from deepfire/ghc-8.4
ghc841:  bump to alpha3
2018-02-07 08:22:55 +01:00
Varun Patro 768fe4f230
Add 'varunpatro' to maintainers list. 2018-02-07 14:00:46 +08:00
Varun Patro e8f480fb6c
Add 'varunpatro' as a maintainer. 2018-02-07 13:59:34 +08:00
Daniel Peebles 30d031b5d8
Merge pull request #34339 from bdarnell/curl-http2-darwin
curlFull: Add http2Support for darwin
2018-02-07 00:28:53 -05:00
adisbladis 910b5cda19
Merge pull request #34686 from flokli/afew-1.3.0
afew: 1.2.0 -> 1.3.0
2018-02-07 13:14:55 +08:00
Tuomas Tynkkynen a008a9cb3b nixos/sd-image-armv7l-multiplatform: Port RPi config.txt changes from aarch64 image
As was done in commit cd2e740dde.
2018-02-07 06:30:34 +02:00
Ben Darnell c6aa69f48c curl: Enable http2Support for darwin
http2Support was disabled due to a bootstrapping issue involving xz.
Now that xz is available in the bootstrap environment for all
platforms, http2Support can be enabled globally.
2018-02-06 21:50:28 -05:00
Peter Hoeg 237ae9a0d1
Merge pull request #34659 from peterhoeg/p/nmapsi4
nmapsi4: init at 0.5-alpha1
2018-02-07 10:14:53 +08:00
Will Dietz 2b8e900403 zsh: set configureFlags and checkFlags at nix level, also fix cross
As-is the use of 'configureFlags="..."' breaks cross compilation
as it drops the configure platforms arguments.

Set zprofile separately to handle $out.
2018-02-06 20:14:52 -06:00
Daniel Frank bfa1390b47
burp: 2.0.54 -> 2.1.28 2018-02-07 10:01:42 +08:00
adisbladis be8cc03ffe
Merge pull request #34679 from dtzWill/update/bfg-1.13.0
bfg-repo-cleaner: 1.12.15 -> 1.13.0
2018-02-07 09:49:40 +08:00
Tuomas Tynkkynen 4c6c919a31 Merge remote-tracking branch 'upstream/master' into HEAD
Conflicts:
	pkgs/os-specific/linux/kernel/generic.nix
2018-02-07 03:41:24 +02:00
adisbladis fc1224d55d
Merge pull request #33743 from fuzzy-id/cassandra-bump
cassandra: version bump 2.1.15->2.1.19, 2.2.9->2.2.11, 3.0.9->3.0.15
2018-02-07 09:17:32 +08:00
adisbladis 5582365d3e
Merge pull request #34664 from ryantm/autoconf-archive
autoconf-archive: 2017.03.21 -> 2017.09.28
2018-02-07 09:13:46 +08:00
Thomas Bach 30c71376c9
cassandra: 3.0.9 -> 3.0.15 2018-02-07 09:09:04 +08:00
Thomas Bach 798c6cdaca
cassandra: 2.2.9 -> 2.2.11 2018-02-07 09:08:41 +08:00
Thomas Bach a9264dbeab
cassandra: 2.1.15 -> 2.1.19 2018-02-07 09:08:17 +08:00
Florian Klink 1cc8ea4ec9 afew: 1.2.0 -> 1.3.0 2018-02-07 00:30:16 +01:00
Robert Schütz b5ecdfa977 nixos/acme: Fix xml (#34683) 2018-02-06 23:27:28 +00:00
Casey Ransom 72cd8c09ce v8_3_16_14: fix on darwin
This was switched to use gcc5 for all platforms due to a mkSnapshot
error, which fixes Linux but currently fails for Darwin. I'm unsure if
there are other runtime failures, but this hasn't been building for
quite some time.
2018-02-06 17:54:16 -05:00
Daiderd Jordan 335ae38674
Merge pull request #33871 from dtzWill/fix/llvm-5-python-closure
llvm-5: add extra 'python' output for opt-viewer tool
2018-02-06 23:33:45 +01:00
Florian Klink 44dd0b6adb svn2git_kde: remove
marked as broken anyways
2018-02-06 22:55:19 +01:00
Michael Raskin 91eb41b138
Merge pull request #33416 from the-kenny/emacs-site-lisp-subdirectory-support
Emacs `site-lisp` subdirectory support
2018-02-06 21:37:07 +00:00
Michael Raskin 718de7c2e4
Merge pull request #33306 from bgamari/patch-2
haskell: Recommend use of hoogle --local
2018-02-06 21:34:10 +00:00
Michael Raskin 907474e649
Merge pull request #33088 from exFalso/add-subdl
init subdl package
2018-02-06 21:32:53 +00:00
Michael Raskin 4b481684b1
Add a date to name 2018-02-06 21:30:36 +00:00
Michael Raskin fdcbb263ac
Merge pull request #32579 from leenaars/lwan
lwan: init -> 0.1
2018-02-06 21:26:18 +00:00
Joachim F e9dd9967ef
Merge pull request #34395 from jonafato/keybase-1.0.40
keybase: 1.0.39 -> 1.0.40
2018-02-06 21:25:30 +00:00
Michael Raskin 8eba2a5be8
Merge pull request #31312 from binarin/emacs-package-set-overrides
emacs-packages: Cleanup and document for overrides
2018-02-06 21:22:23 +00:00
Michael Raskin 1137ba5a73
Merge pull request #27734 from jfrankenau/add-desktop-entries
Add desktop entry files for FreeCAD and ddccontrol
2018-02-06 21:21:04 +00:00
Luke Sandell 4de7e5cae0 dump1090: fix html path
Use correct variable syntax for GNU Make so that HTML resources
can be found when running `dump1090 --net`. Additionally, add
view1090 binary to output.
2018-02-06 22:15:59 +01:00
Raitis 4e63119c54 terraform: add the version component to terraform provider paths (#34497)
Terraform checks the provider versions, but this breaks if the versions
are not provided, as they can be, if the plugins are provided by nix.
2018-02-06 21:09:22 +00:00
Joachim Schiele edeacd00ad security.acme: default name value via module system (#34388) 2018-02-06 21:08:57 +00:00
Tuomas Tynkkynen c9d1bf3e76 platforms.nix: Include RPi 3 serial port in the kernel config 2018-02-06 22:14:09 +02:00
Tuomas Tynkkynen 685ceb999e kernel: Fix missing config options from platform
common-config.nix has:

${kernelPlatform.kernelExtraConfig or ""}

and indeed kernelExtraConfig is in hostPlatform.platform, and not in
hostPlatform. (Ugh.).
2018-02-06 22:13:57 +02:00
Jaakko Luttinen 44509195e5
pythonPackages.pytest-cram: 0.1.1 -> 0.2.0
This fixes pytest-cram after the recent pytest upgrading broke it.
2018-02-06 21:49:44 +02:00
Will Dietz 2e0540f346 bfg-repo-cleaner: 1.12.15 -> 1.13.0 2018-02-06 13:49:09 -06:00
Michael Raskin 5e8ae8d597
Merge pull request #34674 from dtzWill/feature/diff-pdf
diff-pdf: init at 2017-12-30.
2018-02-06 19:33:59 +00:00
Kosyrev Serge 6419664793
ghc841: bump to alpha3 2018-02-06 21:58:32 +03:00
Will Dietz 9e2993e75a diff-pdf: Try to fix darwin build 2018-02-06 12:57:52 -06:00
Will Dietz b963f06f5a diff-pdf: init at 2017-12-30. 2018-02-06 11:57:55 -06:00
Claes Wallin (韋嘉誠) cc2c594a9b hledger*: build correctly on darwin
- mkdir -p $out/share/info rather than assuming $out/share is there
 - find .info and .man* files correctly on darwin -- don't try to
   match the specific system name, there is nothing to gain from that

nix calls darwin darwin, but ghc calls it osx in its directory names.

closes #34644
2018-02-07 01:32:16 +08:00
John Ericson 63b8175281
Merge pull request #34351 from teto/kernel_wip
[RDY] buildLinux: Add more overrides
2018-02-06 12:08:12 -05:00
Matthieu Coudron f620b1b693 kernel: buildLinux replaces import ./generic.nix
- defined buildLinux as generic.nix instead of manual-config.nix. This
makes kernel derivations a tad more similar to your typical derivations.
- moved $buildRoot to within the source folder, this way it doesn't have to be created before the unpackPhase
and make it easier to work on kernel source without running the unpackPhase
2018-02-07 10:07:13 +09:00
Peter Hoeg d4df7aadf9 cryfs: 0.9.8 -> 0.9.9 2018-02-07 00:29:04 +08:00
Frederik Rietdijk ef64766efb
Merge pull request #34653 from mbrgm/upgrade-unifi
unifi: 5.6.29 -> 5.6.30
2018-02-06 16:26:07 +00:00