3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

1230 commits

Author SHA1 Message Date
Tobias Geerinckx-Rice ff7dd3e3b1 hplip: do wrap Python scripts in $out/lib 2015-05-17 23:39:58 +02:00
Tobias Geerinckx-Rice 393219d000 hplip: stop installing corrupted tools
None of the installed tools like hp-align or hp-toolbox could
work, because they tried to import wrapped Python scripts (i.e.
shell code) as Python modules. Fix this by:

- Substituting `dbus` for the defective `pythonDBus`.

- No longer blindly wrapping all python files, but replacing
  the original symlinks in $out/bin with wrapper scripts.
  These wrappers then `exec` the unmodified Python scripts in
  $out/share/hplip directly, instead of the .<name>-wrapped
  copy that wrapPythonProgramsIn creates. The latter are simply
  removed.

Sure, it's a bit ugly. It's also 2015 and I couldn't use my
printer :-/
2015-05-17 21:11:36 +02:00
Thomas Tuegel c59c20ca0f Update HPLIP to 3.15.4 2015-05-16 14:12:11 -05:00
Simon Jagoe 691a65cb41 Update SHA256 for hplip plugin 2015-05-15 13:04:11 +01:00
Pascal Wittmann bb9e9cc3f8 Turned some meta.maintainers into lists 2015-05-14 19:09:43 +02:00
Tobias Geerinckx-Rice 5f7f793d4e hplip: coalesce find -exec sed invocations
No need to scan the (biggish) source tree six times, forking a separate
process for every file each time. This was slowing down testing.
2015-05-13 15:09:43 +02:00
Arseniy Seroka 97cff06f5b Merge pull request #7814 from jagajaga/vim_plugins
vimPlugins: update
2015-05-12 23:57:03 +03:00
Arseniy Seroka a4fc6eb596 vimPlugins: update 2015-05-11 22:46:41 +03:00
Domen Kožar bb4d658f64 Merge branch 'master' into staging
Conflicts:
	nixos/doc/manual/release-notes/rl-unstable.xml
	nixos/modules/services/printing/cupsd.nix
	pkgs/applications/misc/calibre/default.nix
	pkgs/development/haskell-modules/hackage-packages.nix
	pkgs/development/libraries/libsodium/default.nix
	pkgs/misc/emulators/wine/unstable.nix
	pkgs/top-level/all-packages.nix
2015-05-11 10:05:23 +02:00
Arseniy Seroka 87b4f9286d Merge pull request #7604 from bendlas/wine64
wine: add 64 bit build and module
2015-05-10 19:13:37 +03:00
Arseniy Seroka f6016b9a7b Merge pull request #7784 from seppeljordan/emulationstation
Update emulationstation 2.0.0.rc1 -> 2.0.1a
2015-05-10 19:07:46 +03:00
Herwig Hochleitner ae6d2796bc wine: add 64 bit build and nixpkgs configuration
The default release channel (stable/unstable) and the default
build (wine32/wine64/wineWow) can be customized via the "wine" key in config
2015-05-10 15:45:01 +02:00
Jascha Geerds e9cf6cd34f cups: Use systemd files provided by CUPS 2015-05-10 13:46:32 +02:00
Jascha Geerds 252bc4a4b9 cups: Add xdg_utils to build inputs 2015-05-10 13:46:32 +02:00
Jascha Geerds b89bf5668a cups: Refactor meta attributes 2015-05-10 13:46:32 +02:00
William A. Kennington III 862510079a cups: 1.7.5 -> 2.0.2 2015-05-10 13:46:32 +02:00
Michael Raskin a31b9e1816 Update Wine staging to match Wine unstable 2015-05-10 13:46:31 +02:00
Michael Raskin 8a4630d9dd Update Wine unstable 2015-05-10 13:46:31 +02:00
koral 856f1c79e1 slock: 1.1 -> 1.2 2015-05-10 13:46:01 +02:00
Jascha Geerds 4ac95ab328 cups: Use systemd files provided by CUPS 2015-05-10 12:41:20 +02:00
Jascha Geerds 5f5ba7dda0 cups: Add xdg_utils to build inputs 2015-05-10 12:41:20 +02:00
Jascha Geerds 0a090d80ac cups: Refactor meta attributes 2015-05-10 12:41:20 +02:00
William A. Kennington III d6edaea4f7 cups: 1.7.5 -> 2.0.2 2015-05-10 12:41:20 +02:00
Michael Raskin 90453cc5ca Update Wine staging to match Wine unstable 2015-05-10 13:36:48 +03:00
Michael Raskin ede1211cbc Update Wine unstable 2015-05-10 13:36:47 +03:00
Sebastian Jordan 72d3d6fbfc Update emulationstation 2.0.0.rc1 -> 2.0.1a 2015-05-10 01:49:09 +02:00
koral 073d4102b3 slock: 1.1 -> 1.2 2015-05-09 11:02:19 +00:00
William A. Kennington III 074c4a7f78 Merge remote-tracking branch 'upstream/master' into staging 2015-05-07 01:44:49 -07:00
Domen Kožar ce688330fb Merge pull request #7725 from willtim/master
xss-lock: upstream fix: exit when X connection dies
2015-05-06 11:29:35 +02:00
Tim Williams d0462cdf25 xss-lock: upstream fix: exit when X connection dies 2015-05-06 08:52:40 +01:00
Tobias Geerinckx-Rice 65775f9a0e vim-plugins: wakatime 3.0.9 -> 4.0.0 2015-05-03 22:29:14 +02:00
Thomas Tuegel e1cbfa5415 jack2: depend on libsndfile 2015-05-03 12:46:10 -05:00
William A. Kennington III 36f6601e12 gnuk: Add derivation for fst-01 2015-05-02 15:54:42 -07:00
Joachim Fasting bf7ad2d84f meta.description fixups
Mostly scripted substitutions with a couple of subjective enhancements.
2015-04-30 18:17:42 +02:00
Hendrik Bunke c9c972b872 vimPlugins: vim-nerdtree-tabs, vim-buffergator 2015-04-30 17:21:50 +02:00
Pascal Wittmann f99d5cf2fc Fixed some descriptions 2015-04-28 10:55:20 +02:00
Pascal Wittmann 2f15fcc4c9 Merge pull request #7389 from AndersonTorres/atari++
Atari++: 1.46 -> 1.73
2015-04-26 10:05:14 +02:00
William A. Kennington III 418963ef63 jack2: Refactor 2015-04-25 21:27:54 -07:00
William A. Kennington III 04aefc111b jack1: Refactor 2015-04-25 21:27:54 -07:00
Nikolay Amiantov f6607ca4a5 wineStaging: add derivation 2015-04-23 21:00:42 +03:00
Hendrik Bunke a96c076743 vimPlugins: added vim-jinja 2015-04-23 17:40:16 +02:00
Cray Elliott 56de3acd5a dolphinEmuMaster: add libusb to depends, bump git version
this allows dolphin-emu to detect and use the Nintendo Wii U Gamecube Adapter
2015-04-21 20:40:32 -07:00
Tobias Geerinckx-Rice ff6be09c2e Merge pull request #7437 from AndersonTorres/atari800
Atari800: no more ROM install
2015-04-21 03:39:37 +02:00
AndersonTorres 28f5eccd8d Atari800: no more ROM install
Now, the expression will not install ROM files anymore. It is easier the
final user install them locally by himself, in a local directory.
Also, it appears that there is a missing ROM in the package provided by
the project's site.
2015-04-17 21:39:25 -03:00
AndersonTorres 10dbc6cf3a Atari++: 1.46 -> 1.73
And a complete reformulation of build expression.
2015-04-14 22:44:57 -03:00
Kirill Elagin 29f431e2a4 cups-browsed: build with Avahi
Fixes 5409.
2015-04-13 23:21:44 +03:00
Kirill Elagin 82eed03bfa cups-filters: fix build on non-NixOS 2015-04-13 23:20:30 +03:00
AndersonTorres eae83dc472 Atari800: 2.2.1 -> 3.1.0 2015-04-13 05:35:43 -03:00
Arseniy Seroka 0d3be79490 Merge pull request #7323 from AndersonTorres/gxemul
Gxemul: 0.4.6 -> 0.6.0.1
2015-04-12 04:22:16 +03:00
AndersonTorres 9ebba5fe0c Gxemul: 0.4.6 -> 0.6.0.1 2015-04-11 16:00:55 -03:00