3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

127558 commits

Author SHA1 Message Date
Maximilian Bosch 8e70725077
vim_configurable: enable overrides
Sometimes it's needed to override parts of `vim_configurable`, for
instance when using ENSIME (http://ensime.github.io/), in this case you
need a Python interpreter and the modules `sexpdata` and
`websocket_client`.

However overriding `vim_configurable` is quite hard as we run
`vimUtils.makeCustomizable` over the default comming from
`configurable.nix`. Therefore it's necessary to copy the code from
`all-packages.nix` and alter the parts you need: https://nixos.org/nix-dev/2017-April/023364.html

In order to simplify overriding `vim_configurable` I added an
`override` and an `overrideAttrs` function to `vimutils.makeCustomizable`
to ensure that the customization capabilities won't be lost after
altering the derivation.

Now it's possible to write expressions like this without evaluation
failures:

```
with pkgs;

let
  vimPy3 = vim_configurable.override {
    python = python3;
  };
in vimPy3.customize { ... }
```
2018-02-07 16:57:40 +01:00
Mathias Schreck 7bd68dff1e chromedriver: 2.33 -> 2.35 2018-02-07 16:57:10 +01:00
adisbladis ad9fbd93ab
Merge pull request #34700 from k0001/el306
electrum: 3.0.5 -> 3.0.6
2018-02-07 23:51:07 +08:00
adisbladis 26e80dea72
Merge pull request #34694 from rvolosatovs/update/mopidy-iris
mopidy-iris: 3.11.0 -> 3.12.4
2018-02-07 23:37:34 +08:00
Renzo Carbonara 07c7a81b24 electrum: 3.0.5 -> 3.0.6 2018-02-07 16:31:46 +01:00
adisbladis dda6f49192
uriparser: 0.8.4 -> 0.8.5 2018-02-07 23:29:16 +08:00
adisbladis 2c92eceee6
firefox-devedition-bin: 59.0b6 -> 59.0b7 2018-02-07 23:21:44 +08:00
adisbladis 9e55e5a07e
firefox-beta-bin: 59.0b6 -> 59.0b7 2018-02-07 23:21:43 +08:00
Graham Christensen c46c2e281b
Merge pull request #33237 from jluttine/add-diskrsync
diskrsync: init at 20170927
2018-02-07 08:15:20 -05:00
rnhmjoj 5118b86800 nixos/monero: init 2018-02-07 08:04:36 -05:00
Andreas Rammhold 90c0341ca5
Merge pull request #34581 from andir/squid
Squid fix CVE-2018-1000024 & CVE-2018-1000027
2018-02-07 11:09:42 +00:00
Andreas Rammhold ea817d7b6f
squid: fix CVE-2018-1000024 & CVE-2018-1000027 2018-02-07 11:40:46 +01:00
Andreas Rammhold 291b05ee21
squid4: hack to detect our libxml2 2018-02-07 11:40:46 +01:00
Frank Doepper ef727716cf uudeview: init at 0.5.20 2018-02-07 11:38:58 +01:00
Roman Volosatovs 99167e34c9
mopidy-iris: 3.11.0 -> 3.12.4 2018-02-07 11:15:30 +01:00
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