Commit graph

141907 commits

Author SHA1 Message Date
Maximilian Bosch f43446c9ca
vim_configurable: restore ability to override python for modules
It seems as Python will be fetched from $PATH in Vim 8.1:

```
stat("/home/ma27/bin/python", 0x7ffe57a317b0) = -1 ENOENT (No such file or directory)
stat("/run/wrappers/bin/python", 0x7ffe57a317b0) = -1 ENOENT (No such file or directory)
stat("/home/ma27/.nix-profile/bin/python", 0x7ffe57a317b0) = -1 ENOENT (No such file or directory)
stat("/nix/var/nix/profiles/default/bin/python", 0x7ffe57a317b0) = -1 ENOENT (No such file or directory)
stat("/run/current-system/sw/bin/python", {st_mode=S_IFREG|0555, st_size=291, ...}) = 0
readlink("/run/current-system/sw/bin/python", "/nix/store/ggjkqbvwnv7dflkmdgmmp"..., 4096) = 72
```

This breaks in cases where you want to use a modified Python derivation
for the VIM plugins you use in `vim_configurable`:

```
let
  vim_configurable' = vim_configurable.override {
    # python with modules for ensime
    python = python.withPackages (ps: with ps; [ sexpdata websocket_client ]);
  };
in
  vim_configurable'.customize {
    # ...
  }
```

With VIM 8.0 this worked perfectly fine, now it's necessary to install
the modified `python` in $PATH to actually use it, otherwise an error
like this arises:

```
[ensime] A dependency is missing, please `pip2 install sexpdata websocket-client` and restart Vim.
Press ENTER or type command to continue
```

However it should be possible to pass the modified Python to the
modules, the easiest workaround is to write a wrapper which prefixes
$PATH to have the Python derivation available.
2018-05-30 09:16:55 +02:00
Peter Hoeg 10e4e6a45f xca: typo 2018-05-30 15:01:10 +08:00
Orivej Desh ac8dc50c5d pythonPackages.pypeg2: fix nondeterministic test failure
If test_xmlast runs before test_pyPEG2, the tests fail with:

ERROR: runTest (pypeg2.test.test_pyPEG2.ParseInvisibleTestCase)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/build/pyPEG2-2.15.2/pypeg2/test/test_pyPEG2.py", line 258, in runTest
    self.assertEqual(r._ignore1, None)
AttributeError: 'C1' object has no attribute '_ignore1'

https://hydra.nixos.org/build/74632015
2018-05-30 06:23:46 +00:00
Orivej Desh a94021ef40 uade123: fix build after #28029 2018-05-30 06:05:56 +00:00
Orivej Desh 70a041ea8b conntrack-tools: 1.4.4 -> 1.4.5
Fix build with libnetfilter_conntrack 1.0.7.
2018-05-30 05:54:48 +00:00
Peter Hoeg 4e4fb65130 xca: 1.4.1 -> 2.0.1 2018-05-30 13:10:52 +08:00
adisbladis 8f66cd075f
firefox-beta-bin: 61.0b8 -> 61.0b9 2018-05-30 12:00:54 +08:00
adisbladis ce1b5ff26e
firefox-devedition-bin: 61.0b8 -> 61.0b9 2018-05-30 12:00:53 +08:00
adisbladis cfe40f898e
Merge pull request #41172 from holidaycheck/nodejs-10.2.1
nodejs: 10.0.0 -> 10.3.0
2018-05-30 12:00:13 +08:00
aszlig 94bc38e6c1
nixos/bind: Allow to set extra options
BIND doesn't allow the options section (or any section I'd guess) to be
defined more than once, so whenever you want to set an additional option
you're stuck using weird hacks like this:

services.bind.forwarders = lib.mkForce [ "}; empty-zones-enable no; #" ];

This basically exploits the fact that values coming from the module
options aren't escaped and thus works in a similar vain to how SQL
injection works.

Another option would be to just set configFile to a file that includes
all the options, including zones. That obviously makes the configuration
way less extensible and more awkward to use with the module system.

To make sure this change does work correctly I added a small test just
for that. The test could use some improvements, but better to have a
test rather than none at all. For a future improvement the test could be
merged with the NSD test, because both use the same zone file format.

This change has been reviewed in #40053 and after not getting any
opposition, I'm hereby adding this to master.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @peti, @edolstra
Closes: #40053
2018-05-30 05:07:39 +02:00
Francois-Rene Rideau fcc6e91c4e gerbil-unstable: 2018-04-03 -> 2018-05-12 2018-05-29 22:54:18 -04:00
Francois-Rene Rideau 69926e61ea gambit-unstable: 2018-03-26 -> 2018-05-30 2018-05-29 22:54:18 -04:00
Francois-Rene Rideau 3816372808 gambit: use release tarball, not git, for 4.8.9 2018-05-29 22:54:17 -04:00
Orivej Desh a7e93690af pythonPackages.rx: disable check
The tests are nondeterminstic.
2018-05-30 02:43:55 +00:00
Orivej Desh 0159beb89c ns-3: fix build after #28029 2018-05-30 02:37:40 +00:00
Orivej Desh 8edccd928e pythonPackages.datadog: disable check
The tests are nondeterministic.
2018-05-30 02:26:05 +00:00
Peter Simons deeeb5002c ghc: add version 8.4.3 2018-05-30 03:46:16 +02:00
Peter Simons 4f696f391d haskell-fgl: avoid jailbreak to fix the build
A jailbreak-cabal binary compiles against Cabal 2.2.x will break fgl's Cabal
file. Therefore, we just disable the test suite that causes these version
issues.
2018-05-30 03:46:16 +02:00
Peter Simons 2495f07222 haskell-cryptohash-sha256: avoid jailbreak, which breaks the Cabal file 2018-05-30 03:46:16 +02:00
Peter Simons 85c5e8d651 haskell-parsec: drop obsolete jailbreak 2018-05-30 03:46:16 +02:00
Peter Simons 57fed4f5b5 haskell.compiler.ghcHEAD: disable format hardening 2018-05-30 03:46:16 +02:00
Peter Simons 31706eeb93 haskell.compiler.ghc7103: disable format hardening 2018-05-30 03:46:16 +02:00
Peter Simons e168ae6a9d ghc: build version >8.4 with hscolour to enable source links
Fixes https://github.com/NixOS/nixpkgs/issues/41179.
2018-05-30 03:46:16 +02:00
Peter Simons b825481578 haskell-jailbreak-cabal: build with native Cabal version in ghc-8.4.x package set 2018-05-30 03:46:16 +02:00
Peter Simons 5b73d202ab haskell-jailbreak-cabal: build with Cabal 2.2.x in ghc-8.2.x package set 2018-05-30 03:46:16 +02:00
Peter Simons 852e9dc448 haskell-brick: update override for ghc 8.4.x 2018-05-30 03:46:16 +02:00
Peter Simons 9ef8d70d23 haskell-graphviz: override dependency versions to fix the build
Closes https://github.com/ivan-m/graphviz/issues/34.
2018-05-30 03:46:16 +02:00
Peter Simons 60d8e82558 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.9.2-17-g580e4ea from Hackage revision
ae1b1485e2.
2018-05-30 03:46:16 +02:00
Peter Simons 28ca28296f LTS Haskell 11.11 2018-05-30 03:45:54 +02:00
Orivej Desh 798d5f5cdb bitlbee: fix build 2018-05-30 01:35:17 +00:00
Tim Steinbach 9db1f486e1
git: 2.17.0 -> 2.17.1 2018-05-29 21:33:43 -04:00
R. RyanTM 8a0ed10ba7 sc-controller: 0.4.2 -> 0.4.3
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/sc-controller/versions.

These checks were done:

- built on NixOS
- Warning: no invocation of /nix/store/2qlhi6fqx37zhcxdfn5gygl8xq4zkyip-sc-controller-0.4.3/bin/sc-controller had a zero exit code or showed the expected version
- /nix/store/2qlhi6fqx37zhcxdfn5gygl8xq4zkyip-sc-controller-0.4.3/bin/scc passed the binary check.
- Warning: no invocation of /nix/store/2qlhi6fqx37zhcxdfn5gygl8xq4zkyip-sc-controller-0.4.3/bin/scc-daemon had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/2qlhi6fqx37zhcxdfn5gygl8xq4zkyip-sc-controller-0.4.3/bin/scc-osd-dialog had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/2qlhi6fqx37zhcxdfn5gygl8xq4zkyip-sc-controller-0.4.3/bin/scc-osd-keyboard had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/2qlhi6fqx37zhcxdfn5gygl8xq4zkyip-sc-controller-0.4.3/bin/scc-osd-launcher had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/2qlhi6fqx37zhcxdfn5gygl8xq4zkyip-sc-controller-0.4.3/bin/scc-osd-menu had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/2qlhi6fqx37zhcxdfn5gygl8xq4zkyip-sc-controller-0.4.3/bin/scc-osd-message had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/2qlhi6fqx37zhcxdfn5gygl8xq4zkyip-sc-controller-0.4.3/bin/scc-osd-radial-menu had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/2qlhi6fqx37zhcxdfn5gygl8xq4zkyip-sc-controller-0.4.3/bin/scc-osd-show-bindings had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/2qlhi6fqx37zhcxdfn5gygl8xq4zkyip-sc-controller-0.4.3/bin/..sc-controller-wrapped-wrapped had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/2qlhi6fqx37zhcxdfn5gygl8xq4zkyip-sc-controller-0.4.3/bin/.sc-controller-wrapped had a zero exit code or showed the expected version
- /nix/store/2qlhi6fqx37zhcxdfn5gygl8xq4zkyip-sc-controller-0.4.3/bin/..scc-wrapped-wrapped passed the binary check.
- /nix/store/2qlhi6fqx37zhcxdfn5gygl8xq4zkyip-sc-controller-0.4.3/bin/.scc-wrapped passed the binary check.
- Warning: no invocation of /nix/store/2qlhi6fqx37zhcxdfn5gygl8xq4zkyip-sc-controller-0.4.3/bin/..scc-daemon-wrapped-wrapped had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/2qlhi6fqx37zhcxdfn5gygl8xq4zkyip-sc-controller-0.4.3/bin/.scc-daemon-wrapped had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/2qlhi6fqx37zhcxdfn5gygl8xq4zkyip-sc-controller-0.4.3/bin/..scc-osd-dialog-wrapped-wrapped had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/2qlhi6fqx37zhcxdfn5gygl8xq4zkyip-sc-controller-0.4.3/bin/.scc-osd-dialog-wrapped had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/2qlhi6fqx37zhcxdfn5gygl8xq4zkyip-sc-controller-0.4.3/bin/..scc-osd-keyboard-wrapped-wrapped had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/2qlhi6fqx37zhcxdfn5gygl8xq4zkyip-sc-controller-0.4.3/bin/.scc-osd-keyboard-wrapped had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/2qlhi6fqx37zhcxdfn5gygl8xq4zkyip-sc-controller-0.4.3/bin/..scc-osd-launcher-wrapped-wrapped had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/2qlhi6fqx37zhcxdfn5gygl8xq4zkyip-sc-controller-0.4.3/bin/.scc-osd-launcher-wrapped had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/2qlhi6fqx37zhcxdfn5gygl8xq4zkyip-sc-controller-0.4.3/bin/..scc-osd-menu-wrapped-wrapped had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/2qlhi6fqx37zhcxdfn5gygl8xq4zkyip-sc-controller-0.4.3/bin/.scc-osd-menu-wrapped had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/2qlhi6fqx37zhcxdfn5gygl8xq4zkyip-sc-controller-0.4.3/bin/..scc-osd-message-wrapped-wrapped had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/2qlhi6fqx37zhcxdfn5gygl8xq4zkyip-sc-controller-0.4.3/bin/.scc-osd-message-wrapped had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/2qlhi6fqx37zhcxdfn5gygl8xq4zkyip-sc-controller-0.4.3/bin/..scc-osd-radial-menu-wrapped-wrapped had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/2qlhi6fqx37zhcxdfn5gygl8xq4zkyip-sc-controller-0.4.3/bin/.scc-osd-radial-menu-wrapped had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/2qlhi6fqx37zhcxdfn5gygl8xq4zkyip-sc-controller-0.4.3/bin/..scc-osd-show-bindings-wrapped-wrapped had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/2qlhi6fqx37zhcxdfn5gygl8xq4zkyip-sc-controller-0.4.3/bin/.scc-osd-show-bindings-wrapped had a zero exit code or showed the expected version
- 3 of 30 passed binary check by having a zero exit code.
- 0 of 30 passed binary check by having the new version present in output.
- found 0.4.3 with grep in /nix/store/2qlhi6fqx37zhcxdfn5gygl8xq4zkyip-sc-controller-0.4.3
- directory tree listing: https://gist.github.com/28b55137e29bb39ba0741bd1847fe529
- du listing: https://gist.github.com/446c39be30dba3aa0dc166afa85e757a
2018-05-30 00:52:16 +00:00
Orivej Desh 9d33897461 zeroc-ice: fix parallel building 2018-05-30 00:20:27 +00:00
Orivej Desh 796080f396 pythonPackages.bsddb3: fix build after 0fd461d5 2018-05-29 23:57:23 +00:00
Orivej Desh e4df80a69b haskellPackages.hlibgit2: fix build after #28029 2018-05-29 23:57:23 +00:00
Daiderd Jordan 6bb08e881d
gdk-pixbuf: patch library rpath references on darwin
A bunch of the libraries like libpixbufloader-png link against libgdk_pixbuf,
however the install_name is not correct at this point yet since meson tries to use rpaths.
2018-05-30 01:26:24 +02:00
Orivej Desh 7cadf50be2 virtualbox: fix build after #28029 2018-05-29 23:16:51 +00:00
Daiderd Jordan c4e9ebc248
Merge pull request #38791 from LnL7/nixos-profile-variables
nixos: remove PKG_CONFIG_PATH/PERL5LIB environment variables
2018-05-30 00:23:34 +02:00
Will Fancher 7a23f1acca GHCJS darwin fixes (#41120)
* GHCJS darwin fixes

* Fix ghcjs 80 and 710 packages

* Add socket-io to ghcjs 82 and 84 passthru
2018-05-29 23:39:21 +02:00
Jörg Thalheim b02b464852 neovim-remote: 1.8.6 -> 2.0.5 2018-05-29 22:30:18 +01:00
worldofpeace 570327b0a3 messenger-for-desktop: remove (#41224) 2018-05-29 23:25:11 +02:00
Jörg Thalheim b438709ca6
Merge pull request #41219 from tilpner/racket-uname
racket: use proper uname, allow for unix sockets
2018-05-29 22:16:36 +01:00
Jörg Thalheim 173cefd4e3
Merge pull request #41213 from flokli/svn-all-fast-export-1.0.12
gitAndTools.svn-all-fast-export: 1.0.11 -> 1.0.12
2018-05-29 22:15:44 +01:00
worldofpeace 41bb69fa88 typora: gnome2 cleanup (#41167) 2018-05-29 22:04:04 +02:00
worldofpeace bab973a28b discord: gnome2 cleanup (#41174)
* discord: gnome2 cleanup

* discord: use top-level gtk2
2018-05-29 21:59:05 +02:00
worldofpeace 1f14408b0e skypeforlinux: gnome2 cleanup (#41176)
* skypeforlinux: gnome2 cleanup

* skypeforlinux: use toplevel gdk_pixbuf and gtk2
2018-05-29 21:54:42 +02:00
Mathias Schreck 9a7b9675d9 nodejs: 10.0.0 -> 10.3.0 2018-05-29 21:44:58 +02:00
worldofpeace e25e9d6191 wire-desktop: gnome2 cleanup (#41155)
* wire-desktop: gnome2 cleanup

* wire-desktop: use toplevel gtk2
2018-05-29 21:40:59 +02:00
worldofpeace 52b3f49797 hyper: gnome2 cleanup (#41170)
* hyper: gnome2 cleanup

* hyper: use toplevel gtk2
2018-05-29 21:35:43 +02:00
Vincent Demeester e62b01b78e drone: 0.5 -> 0.8.5 (#41200)
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2018-05-29 21:21:19 +02:00