1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-26 23:52:33 +00:00
Commit graph

140724 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
Robert Schütz 57d591ec7f
youtube-dl: use toPythonApplication (#40831) 2018-05-22 11:01:55 +02:00
Andrea Bedini 561a1f177a pythonPackages.docker: 3.2.1 -> 3.3.0 (#40857) 2018-05-22 11:00:37 +02:00
xeji 41344b8d62
Merge pull request #40886 from Synthetica9/atom-1-27-1
atom: 1.27.0 -> 1.27.1, atom-beta: 1.24.0-beta3 -> 1.28.0-beta1
2018-05-22 10:38:33 +02:00
Peter Simons 07a045922d
Merge pull request #40710 from ElvishJerricco/overrideCabal-getHaskellBuildInputs
Make getHaskellBuildInputs / shellFor work with overrideCabal (Fixes #40266)
2018-05-22 10:37:26 +02:00
xeji 5093abc8f1
Merge pull request #40900 from flokli/oracle-fixes
oracle-instantclient: simplify a lot, use autoPatchelfHook
2018-05-22 10:36:12 +02:00
Peter Simons bd60d9a6bb all-cabal-hashes: update Hackage snapshot to latest version 2018-05-22 10:34:21 +02:00
Moritz Angermann 4b2eceaa35 ghc: fix dylib load command limits in compiler version 8.x
See https://phabricator.haskell.org/D4714 for the full details.
This will be part of ghc 8.6.

Closes https://github.com/NixOS/nixpkgs/pull/40877.
2018-05-22 10:32:17 +02:00
Peter Simons e9d991a938 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.9.2-13-gd8bc043 from Hackage revision
a5d0811a16.
2018-05-22 10:32:09 +02:00
Peter Simons 3e2a3b4f12 hackage2nix: keep haddock-library 1.5.x around 2018-05-22 10:31:39 +02:00
Frederik Rietdijk 9f87abded9
Merge pull request #40885 from plapadoo/pyogg-init
pyogg: init at 0.6.2a1
2018-05-22 10:28:20 +02:00
Jaka Hudoklin 856ffc6380
Merge pull request #40905 from Pneumaticat/patch-2
kubernetes-dashboard: raise memory limit to 250MB
2018-05-22 09:42:36 +02:00
Patrick Hilhorst 2ad8e9a978
atom, atom-beta: 1.27.0 -> 1.27.1, 1.24.0-beta3 -> 1.28.0-beta1
Also rewrote the derivation for easier maintencence.

(And added @ysndr as maintainer for atom-beta, kind of an implicit
result of joining the two. If you're not okay with that, I'll patch
you out, but I'll presume consent.)
2018-05-22 09:40:00 +02:00
Philipp Middendorf 131228c29d pyogg: init at 0.6.2a1 2018-05-22 09:26:26 +02:00
Jörg Thalheim 090b7cc8f1 purple-xmpp-http-upload: use date of commit as version 2018-05-22 08:14:19 +01:00
Jörg Thalheim 5a7e42f6a3
Merge pull request #40908 from emmanuelrosa/purple-xmpp-http-upload
purple-xmpp-http-upload: init at 178096c
2018-05-22 08:12:53 +01:00
Yegor Timoshenko c68996f147
Merge pull request #40869 from r-ryantm/auto-update/apache-maven
maven: 3.5.2 -> 3.5.3
2018-05-22 05:52:40 +03:00
Yegor Timoshenko 5cd1e34507
Merge pull request #40907 from yegortimoshenko/20180522.041617/wireguard-tools-cleanup
wireguard-tools: clean up, wrap w/ wireguard-go on Darwin
2018-05-22 04:53:08 +03:00
Tim Steinbach 888e22cbd9
ammonite: 1.1.0 -> 1.1.2 2018-05-21 21:37:26 -04:00
Florian Klink 9770699ebd oracle-instantclient: disable building on hydra
we requireFile, so hydra can't build it anyways.
2018-05-22 03:35:05 +02:00
Florian Klink fe56ad70f0 oracle-instantclient: simplify, use autoPatchelfHook
Split `buildCommand`, provide `unpackCmd` and add `installPhase`.

Use autoPatchelfHook, we can get rid of all the manual hacking around
with patchelf.

Use install to install to $out
2018-05-22 03:34:55 +02:00
Yegor Timoshenko e9e044abbb wireguard-tools: clean up, wrap w/ wireguard-go on Darwin 2018-05-22 04:24:34 +03:00
Kevin Liu b6f2e75d75
kubernetes-dashboard: raise memory limit to 250MB
On my cluster, I often get OOM errors that cause the dashboard to crash just by going over 50MB.
2018-05-21 21:07:24 -04:00
Yegor Timoshenko ed82674954
Merge pull request #40903 from zx2c4-forks/wireguard-fixes
wireguard: fix up text, maintainer, and version
2018-05-22 03:59:47 +03:00
Jason A. Donenfeld 8d575415ad wireguard: fix up text, maintainer, and version 2018-05-22 02:58:13 +02:00
Matthew Bauer f22a63d533 libretro: build cores on darwin 2018-05-21 19:55:37 -05:00
Matthew Bauer 04bc0bd2b7 freeciv: cleanup overrides
This is how we do overrides elsewhere. The "name" suffix makes things
a little bit complicated IMO. Other input welcome.
2018-05-21 19:55:37 -05:00
Matthew Bauer dadb35fdb3 nvidia-texture-tools: support darwin 2018-05-21 19:55:37 -05:00
Matthew Bauer f2dc19703a spidermonkey_38: add darwin support 2018-05-21 19:55:37 -05:00
Matthew Bauer 50c158dee8 enet: supports darwin 2018-05-21 19:55:37 -05:00
Matthew Bauer 3dc8328b1f sfml: support darwin 2018-05-21 19:55:37 -05:00
xeji b72a8a41c3
Merge pull request #40725 from yurrriq/update/autojump
autojump: rework
2018-05-22 02:52:09 +02:00
Yegor Timoshenko 4f979105af
wireguard-go: fix hash 2018-05-22 03:40:14 +03:00
xeji 8b29ccb341
Merge pull request #40889 from GrigoriyDmitriev/kakoune20180521
kakoune-unstable: 2018-03-22 -> 2018-05-21, debug mode disabled
2018-05-22 02:27:53 +02:00
Yegor Timoshenko 643462aef3
Merge pull request #40902 from zx2c4-forks/do-people-actually-use-nix-for-darwin
wireguard: bump version and limit platforms
2018-05-22 03:24:12 +03:00
Jason A. Donenfeld 0f2de9334e wireguard: bump version and limit platforms 2018-05-22 02:16:33 +02:00
Yegor Timoshenko 5da85431fb
Merge pull request #40892 from NixOS/no-more-nixpkgs-symlink
Stop requiring the nixpkgs symlink in NixOS channel tarballs
2018-05-22 03:16:04 +03:00
R. RyanTM 0106dfcbeb rust-bindgen: 0.36.1 -> 0.37.0 (#40833)
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

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

These checks were done:

- built on NixOS
- /nix/store/y7lbrcpy05c1br43257fj056p6vf269l-rust-bindgen-0.37.0/bin/bindgen passed the binary check.
- Warning: no invocation of /nix/store/y7lbrcpy05c1br43257fj056p6vf269l-rust-bindgen-0.37.0/bin/.bindgen-wrapped had a zero exit code or showed the expected version
- 1 of 2 passed binary check by having a zero exit code.
- 1 of 2 passed binary check by having the new version present in output.
- found 0.37.0 with grep in /nix/store/y7lbrcpy05c1br43257fj056p6vf269l-rust-bindgen-0.37.0
- directory tree listing: https://gist.github.com/dab90e1565932370211bc1cb47b526d9
- du listing: https://gist.github.com/1ea884a58cb25990e712703124f8a6da
2018-05-22 02:07:27 +02:00
R. RyanTM 9cf701f856 mutt: 1.9.5 -> 1.10.0 (#40846)
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

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

These checks were done:

- built on NixOS
- /nix/store/ydny2lhs0idsg1hxzkgi198n9jn17rcw-mutt-1.10.0/bin/mutt passed the binary check.
- /nix/store/ydny2lhs0idsg1hxzkgi198n9jn17rcw-mutt-1.10.0/bin/pgpring passed the binary check.
- Warning: no invocation of /nix/store/ydny2lhs0idsg1hxzkgi198n9jn17rcw-mutt-1.10.0/bin/pgpewrap had a zero exit code or showed the expected version
- /nix/store/ydny2lhs0idsg1hxzkgi198n9jn17rcw-mutt-1.10.0/bin/muttbug passed the binary check.
- /nix/store/ydny2lhs0idsg1hxzkgi198n9jn17rcw-mutt-1.10.0/bin/flea passed the binary check.
- Warning: no invocation of /nix/store/ydny2lhs0idsg1hxzkgi198n9jn17rcw-mutt-1.10.0/bin/smime_keys had a zero exit code or showed the expected version
- 4 of 6 passed binary check by having a zero exit code.
- 0 of 6 passed binary check by having the new version present in output.
- found 1.10.0 with grep in /nix/store/ydny2lhs0idsg1hxzkgi198n9jn17rcw-mutt-1.10.0
- directory tree listing: https://gist.github.com/2b53d5dc44b600872e77911ba7099e1c
- du listing: https://gist.github.com/4caca5d9043a5281a6b192ebaf30065f
2018-05-22 02:03:26 +02:00
John Ericson 67682550ed
Merge pull request #40898 from obsidiansystems/requireFile-without-cc
requireFile: Use stdenvNoCC
2018-05-21 19:48:02 -04:00
Florian Klink 82eaa5ba37 oracle-instantclient: add flokli as maintainer 2018-05-22 01:29:00 +02:00
John Ericson 9ec53a397f requireFile: Use stdenvNoCC
There's no need for a C compiler
2018-05-21 19:26:36 -04:00
xeji fe79fc0be4
nixos/tests/mysql-replication: fix test (#40850)
Failed non-deterministically on hydra because replcation
sometimes was not finished yet when checking the results.
2018-05-22 01:22:12 +02:00
Matthew Justin Bauer 050d07d672
gn: fix patch url
Fixes #40891
2018-05-21 17:43:22 -05:00
Frank Doepper 07723f14bb shotcut: 18.03.06 -> 18.05.08 (#40887) 2018-05-22 00:10:32 +02:00
Andreas Rammhold f763f8cdfe
Merge pull request #40890 from dotlambda/restic-0.9.0
restic: 0.8.3 -> 0.9.0
2018-05-22 00:05:41 +02:00
Will Dietz 527405a2f0
Merge pull request #40894 from dtzWill/update/heaptrack-1.1
heaptrack: 2018-01-28 -> 1.1.0
2018-05-21 16:34:09 -05:00
Daniel Peebles 0598652303
Stop requiring the nixpkgs symlink in NixOS channel tarballs
Ideally I'd like the whole `nixos`/`nixpkgs` channel distinction to disappear, but this is a step along that path. After a while being in this state, we can stop creating the magic `nixpkgs -> .` symlink inside our `nixos` channel tarballs and simplify that whole mess a bit.
2018-05-21 16:41:03 -04:00
Will Dietz 5f9b259710 heaptrack: 2018-01-28 -> 1.1.0
use new stable release!
2018-05-21 15:36:25 -05:00
Robert Schütz 3709e30d06 restic: 0.8.3 -> 0.9.0 2018-05-21 22:15:33 +02:00