Commit graph

14384 commits

Author SHA1 Message Date
8573
14120a423b dmenu: Fix scripts to run commands by store paths (#17709)
The `dmenu` package includes two binary programs, `dmenu` and `stest`,
and two shell scripts, `dmenu_run` and `dmenu_path`. `dmenu_run`
invokes `dmenu` and `dmenu_path`, and `dmenu_path` invokes `stest`.

`dmenu_run`'s invocation of `dmenu` was patched to run it by its full
store path, but its invocation of `dmenu_path` and `dmenu_path`'s
invocation of `stest` were not.

If `dmenu_path` and `stest` were not in the set of system packages or
otherwise in the `PATH`, this situation would result in `dmenu_run`
opening a dmenu instance with no menu entries (which would normally be
generated by `dmenu_path`, which `dmenu_run` couldn't find, as it was
running it by `PATH` lookup).

This commit fixes the package to also patch the invocation of
`dmenu_path` in `dmenu_run` and the invocations of `stest` in
`dmenu_path` to invoke those programs by their full store paths.

I have tested this change on NixOS.
2016-08-14 11:38:25 +00:00
Peter Hoeg
6172662676 syncthing: 0.14.3 -> 0.14.4 (#17723) 2016-08-14 11:30:19 +00:00
Frederik Rietdijk
eb3e23c49e Remove top-level setuptools
See #11567.
2016-08-14 13:07:26 +02:00
Frederik Rietdijk
57b9ff06f1 Remove top-level pylint
See #11567.
2016-08-14 13:07:26 +02:00
Frederik Rietdijk
b6452f8534 Remove top-level pygame
See #11567.
2016-08-14 13:07:26 +02:00
Frederik Rietdijk
6842a24b21 Remove top-level pyqt4
See #11567.
2016-08-14 12:38:01 +02:00
Frederik Rietdijk
11d1fdfd8b Remove top-level cython and cython3
See #11567.
2016-08-14 12:01:09 +02:00
Austin Seipp
97e5b88d06 nixpkgs: abc-verifier 20150614 -> 20160813
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2016-08-13 17:48:42 +00:00
Luca Bruno
c8ca30fe2a Merge pull request #17247 from lucas8/yadm
yadm: init at 1.04
2016-08-12 22:08:29 +01:00
Luca Bruno
27f294f38d Merge pull request #17589 from cmfwyp/sagemath
sagemath: update mirrors, fix TeX Live dependency
2016-08-12 21:58:41 +01:00
Luca Bruno
2d4afafc64 Merge pull request #17692 from mimadrid/update/filezilla-3.20.1
filezilla: 3.20.0 -> 3.20.1
2016-08-12 21:46:45 +01:00
zimbatm
c2302f2f45 Merge pull request #17677 from kamilchm/no-go-libs-json
buildGoPackage: remove Go deps file `libs.json`
2016-08-12 18:13:29 +01:00
Miguel Madrid
bd20aaa767 diff-so-fancy: 0.10.1 -> 0.11.1 (#17691) 2016-08-12 15:12:29 +02:00
Ram Kromberg
4412bcc135 audacious: 3.5.2 -> 3.7.2
Fixes #17543.

@fpletz: Removed unnecessary autotools dependencies & use wrapGAppsHook
instead of makeWrapper.
2016-08-12 14:22:09 +02:00
mimadrid
300e83ba3a
filezilla: 3.20.0 -> 3.20.1 2016-08-12 14:08:38 +02:00
Kamil Chmielewski
da3ddd48e4 buildGoPackage: remove Go deps file libs.json
After #16017 there were a lot
of comments saying that `nix` would be better than `JSON`
for Go packages dependency sets.
As said in https://github.com/NixOS/nixpkgs/pull/16017#issuecomment-229624046

    > Because of the content-addressable store, if two programs have the
    > same dependency it will already result in the same derivation in
    > the
    > store. Git also has compression in the pack files so it won't make
    > much difference to duplicate the dependencies on disk. And finally
    > most users will just use the binary builds so it won't make any
    > differences to them.

This PR removes `libs.json` file and puts all package dependencies in
theirs `deps.json`.
2016-08-11 23:07:09 +02:00
Robin Gloster
cfdab94bb3 Merge pull request #16752 from phunehehe/android-studio
android-studio: repackage in an FHS environment
2016-08-11 17:10:01 +00:00
Michael Raskin
7b8bd1779e libreoffice-fresh: kill some tests 2016-08-11 18:49:18 +02:00
Michael Raskin
3bf7d5ca03 libreoffice-fresh: 5.1.3.2 -> 5.2.0.4, tests fail for now 2016-08-11 18:49:18 +02:00
Michael Raskin
45a61dc067 Tolerate missed spaces in the download list 2016-08-11 18:49:18 +02:00
Michael Raskin
b189d34a1b libreoffice-still: 5.0.6.3 -> 5.1.5.2 2016-08-11 18:49:18 +02:00
Robin Gloster
40d217b90e Merge pull request #17657 from matthewbauer/darwin-misc
Darwin misc. fixes
2016-08-11 16:41:34 +00:00
Robin Gloster
e8c7f1953d Merge pull request #17666 from regnat/spotify
spotify : 1.0.34.146.g28f9eda2-19 -> 1.0.36.120.g536a862f-20
2016-08-11 16:34:45 +00:00
Michael Raskin
b839d0cd75 compiz: 0.9.12.2 -> 0.9.13.0 2016-08-11 17:57:35 +02:00
Michael Raskin
d1951974df golly: 2.7 -> 2.8 2016-08-11 17:57:35 +02:00
Michael Raskin
da4b7afea8 pari: 2.7.5 -> 2.7.6 2016-08-11 17:57:35 +02:00
Michael Raskin
4fd2adb604 baresip: 0.4.19 -> 0.4.20 2016-08-11 17:57:35 +02:00
Théophane Hufschmitt
dcdcea9938 timewarrior : fix manpages installation (#17667) 2016-08-11 17:54:49 +02:00
Théophane Hufschmitt
1ecab4189f spotify : 1.0.34.146.g28f9eda2-19 -> 1.0.36.120.g536a862f-20 2016-08-11 17:28:38 +02:00
Eelco Dolstra
8877b93649 firefox: 47.0.1 -> 48.0 2016-08-11 16:09:00 +02:00
Katona László
40f6d7ea5d fehlstart: init at 9f4342d7 2016-08-11 10:59:04 +02:00
Matthew Bauer
96322f6926 bcftools: fix darwin building
gcc not available
2016-08-10 22:48:19 -05:00
Matthew Bauer
ee63056476 aspino: patch to use c++ instead of g++ 2016-08-10 22:29:18 -05:00
Matthew Bauer
b3cb07e130 lie: only build on linux
Darwin build fails from conflicts in libSystem:

In file included from altdom.c:1:
In file included from /private/var/folders/7t/4vz31njj37b8y_bg6z3t7tk00000gn/T/nix-build-LiE-2.2.2.drv-0/LiE/lie.h:34:
In file included from /nix/store/9ll4m9yx854hr64fn1w9ra3qimm3pzdk-Libsystem-osx-10.9.5/include/string.h:176:
/nix/store/9ll4m9yx854hr64fn1w9ra3qimm3pzdk-Libsystem-osx-10.9.5/include/strings.h:73:7: error: redefinition of 'index' as different kind of symbol
char    *index(const char *, int) __POSIX_C_DEPRECATED(200112L);
         ^
/private/var/folders/7t/4vz31njj37b8y_bg6z3t7tk00000gn/T/nix-build-LiE-2.2.2.drv-0/LiE/lie.h:6:14: note: previous definition is here
typedef long index;
             ^
1 error generated.
2016-08-10 21:06:22 -05:00
Matthew Bauer
d4b1289592 lie: LiE -> lie
Attributes need to be lowercase, see https://nixos.org/nixpkgs/manual/#sec-package-naming.
2016-08-10 21:04:16 -05:00
Teo Klestrup Röijezon
b22afb1de8 playonlinux: 4.2.9 -> 4.2.10 2016-08-11 02:24:41 +02:00
Derek Gonyeo
6aa60630cf acbuild: v0.3.0 -> v0.4.0 2016-08-10 13:39:30 -07:00
Vladimír Čunát
947abb08ac Merge branch 'staging' 2016-08-10 22:09:38 +02:00
zimbatm
a4161ac355 terraform: fixes the plugins
The plugins are now part of the binary and cause conflict when available
in the $PATH as well.
2016-08-10 18:01:52 +01:00
obadz
8df7571bbc geogebra: don't build on hydra since derivation just unpacks jars 2016-08-10 14:35:14 +01:00
Mohammed Yaseen Mowzer
04f0cb86d0 geogebra: init at 5.0.265.0
Closes #17400
2016-08-10 14:32:09 +01:00
Hoang Xuan Phu
f822b93e05 android-studio: repackage in an FHS environment
This commit fixes 2 main problems:

  - Android Studio comes with its own package manager. The current
    packaging approach doesn't allow such management. As a result the
    package is unusable (see
    https://github.com/NixOS/nixpkgs/issues/8650 and
    https://github.com/NixOS/nixpkgs/issues/14903). In this version,
    $ANDROID_HOME is _not_ set, allowing Android Studio to deal with the
    Android SDK as it pleases (typically in $HOME/Android/Sdk).

  - Android Studio downloads prebuilt binaries as part of the SDK. These
    tools (e.g. `mksdcard`) have `/lib/ld-linux.so.2` set as the
    interpreter. An FHS environment is used as a work around for that.
2016-08-10 20:42:16 +08:00
Frederik Rietdijk
c99e8b94c2 Merge pull request #17611 from despairblue/update/atom
update atom
2016-08-10 11:40:51 +02:00
Frederik Rietdijk
111d7a2af4 Merge pull request #17623 from matthewbauer/misc
Misc. hydra fixes
2016-08-10 11:35:44 +02:00
obadz
3822c56e1e chromium: minor fixups
cc @aszlig
2016-08-10 02:35:59 +01:00
Matthew
0bb4604b0b i-score: update sha
Somehow, the sha256 has been changed. This seems to be from the
different submodules within the repository.
2016-08-09 21:56:42 +00:00
Matthew
aa9cd7b66d sooperlooper: use autconf correctly 2016-08-09 21:19:34 +00:00
Matthew
473a656426 vacuum-im: add -lz to NIX_LDFLAGS
This should be fixed upstream, but it's broken regardless.

http://hydra.nixos.org/build/38322959/nixlog/1
2016-08-09 21:09:28 +00:00
Matthew
7833781b43 wikicurses: fix build error
It would error when a config file was missing. This patch comes from
github and can be removed once 4b944ac339312b642c6dc5d6b5a2f7be7503218f
is included in a release.
2016-08-09 20:58:52 +00:00
Stefan Junker
918b11e64c rkt: 1.11.0 -> 1.12.0 (#17620) 2016-08-09 22:23:05 +02:00