1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-26 07:31:20 +00:00
Commit graph

3948 commits

Author SHA1 Message Date
Vladimír Čunát 985d1ac425
Merge branch 'master' into staging-next
There were several more conflicts from name -> pname+version;
all auto-solved by kdiff3, hopefully OK.

Hydra nixpkgs: ?compare=1538611
2019-08-25 14:57:11 +02:00
Vladyslav M e5d8f76616
scrcpy: 1.8 -> 1.10 2019-08-24 16:39:42 +03:00
Vladimír Čunát 2e6bf42a22
Merge branch 'master' into staging-next
There ver very many conflicts, basically all due to
name -> pname+version.  Fortunately, almost everything was auto-resolved
by kdiff3, and for now I just fixed up a couple evaluation problems,
as verified by the tarball job.  There might be some fallback to these
conflicts, but I believe it should be minimal.

Hydra nixpkgs: ?compare=1538299
2019-08-24 08:55:37 +02:00
Tadeo Kondrak 58d383a5dc
wine{,-mono,-unstable,-staging}: update
wine: 4.0.1 -> 4.0.2
wine-mono: 4.9.0 -> 4.9.2
wine-unstable: 4.12.1 -> 4.14
wine-staging: 4.12.1 -> 4.14
2019-08-23 14:25:12 -06:00
Linus Heckemann d1d602f559 Merge remote-tracking branch 'origin/master' into openssl-1.1 2019-08-23 17:27:39 +02:00
Sarah Brofeldt 33e33eebbe
Merge pull request #66252 from ivan/scream-receivers
scream-receivers: init at 3.3
2019-08-23 15:30:48 +02:00
ash lea fe9e1854cc dolphinEmuMaster: update to latest upstream 2019-08-23 02:41:36 -07:00
ash lea 44b0d3ff6b dolphinEmuMaster: add ashkitten as maintainer 2019-08-23 02:41:36 -07:00
ash lea acbe898c8b dolphinEmuMaster: use lib instead of stdenv.lib 2019-08-23 02:41:36 -07:00
ash lea 32f332fded dolphinEmu: use lib instead of stdenv.lib 2019-08-23 02:41:36 -07:00
ash lea bd8f12024b dolphinEmuMaster: use wrapQtAppsHook 2019-08-23 02:41:36 -07:00
ash lea 4a7992d2b8 dolphinEmu: fix build 2019-08-23 02:41:36 -07:00
Malo Bourgon b433ba7d82 vimPlugins.coc-nvim: 0.0.73 -> 0.0.74 2019-08-23 11:12:12 +09:00
Robin Gloster f651422a25
tw-rs: remove
Dead project, broken with openssl 1.1
2019-08-21 21:01:52 +02:00
worldofpeace 7667ae1a2e
Merge pull request #66842 from tilpner/maintainer-fixup
tree-wide: fix malformed meta.maintainers
2019-08-19 11:35:10 -04:00
parisni cc0fbe5893 vimPlugins.readline.vim: init at 2019-06-10 2019-08-19 21:57:45 +09:00
tilpner 0281599ad2
tree-wide: fix malformed meta.maintainers
These packages stood out while processing packages.json.gz,
where the maintainer field of some packages wasn't a list of sets,
but a nested list, or a string.
2019-08-19 11:58:27 +02:00
gnidorah 71a3c13d6b qtcurve: use qt5's mkDerivation 2019-08-19 08:04:51 +02:00
gnidorah 95cec2ffe3 kde2-decoration: use qt5's mkDerivation 2019-08-19 08:04:51 +02:00
Frederik Rietdijk f65aa21bb2 Merge master into staging-next 2019-08-18 12:53:44 +02:00
volth c814d72b51 treewide: name -> pname 2019-08-17 10:54:38 +00:00
Timo Kaufmann 1eddfda963
vimPlugins: update (#66749) 2019-08-17 12:06:45 +02:00
Frederik Rietdijk fe9a3e3e63 Merge staging-next into staging 2019-08-17 09:39:23 +02:00
volth 46420bbaa3 treewide: name -> pname (easy cases) (#66585)
treewide replacement of

stdenv.mkDerivation rec {
  name = "*-${version}";
  version = "*";

to pname
2019-08-15 13:41:18 +01:00
Tmplt 8294b9bde6 Merge remote-tracking branch 'upstream/master' into vim-plugins 2019-08-15 11:28:44 +02:00
Matthew Bauer e9b7085ff8 cups: add myself as maintainer 2019-08-14 11:47:48 -04:00
symphorien 757ac88383 utsushi: init at 3.57.0 (#65223) 2019-08-14 08:37:19 +00:00
Wael Nasreddine a3bf0c2e40
vimPlugins: turn filetype and syntax before sourcing the plugins (#66536)
Vim Terraform expects the `filetypedetect` group to exist. However, since we were enabling the filetype and the syntax *after* loading the plugins, it was exiting with an error preventing us from generating the remote plugins manifest with the plugin enabled. See #65894 for context.
2019-08-13 12:25:06 -07:00
Marek Mahut d4b6735f55
Merge pull request #63424 from r-ryantm/auto-update/seafile-shared
seafile-shared: 6.2.11 -> 7.0.2
2019-08-12 18:48:30 +02:00
Timo Kaufmann 5fa2f51448
vimPlugins: update (#66491) 2019-08-12 11:29:07 +02:00
Maximilian Bosch 12a7cc0d1f
Merge pull request #52685 from timokau/fzf-vim-dep
vimPlugins.fzf-vim: automatically add fzfWrapper
2019-08-11 17:16:36 +02:00
Marek Mahut 91931999d7 seafile-shared: 7.0.1 -> 7.0.2 2019-08-10 16:03:51 +02:00
Ivan Kozik 52fcb87529 scream-receivers: init at 3.3 2019-08-07 07:17:15 +00:00
worldofpeace e62be3ebf0 adwaita-qt: 1.0 -> 1.1.0
Adds support for the new refreshed Adwaita theme.

https://github.com/FedoraQt/adwaita-qt/releases/tag/1.1.0
2019-08-05 12:26:27 -04:00
marius851000 f2068d3aa4 dolphinEmuMaster: update to the latest upstream version 2019-08-04 18:10:11 -07:00
Timo Kaufmann 48a72e1979
vimPlugins: update (#65834) 2019-08-03 12:43:33 +02:00
Frederik Rietdijk d20a59d2e5 Merge master into staging-next 2019-08-02 23:27:18 +02:00
Michael Raskin 66644848cb
Merge pull request #64753 from malob/update-add-vim-plugin-docs
Updating documentation about adding new Vim plugins
2019-08-02 21:25:16 +00:00
Frederik Rietdijk 6f723b9bad Merge master into staging-next 2019-08-02 09:18:37 +02:00
adisbladis 9e9c6de50c
nodejs-8_x: Drop package
It will be EOL within the support period of 19.09
2019-08-02 02:34:47 +02:00
K. Bruneau 7c4d08421e winetricks: 20190310 -> 20190615 (#64706) 2019-08-01 10:47:16 -04:00
Frederik Rietdijk 55e4555b77 Merge master into staging-next 2019-08-01 09:42:54 +02:00
vasile luta d2dc2593db vimPlugins: update;
add merge-tool, quickfix-reflector.vim, twig-vim, jsx-vim, vim-javascript-syntax, vim-html-template-literals, starsearch-vim
2019-07-30 12:55:53 +03:00
Matthieu Coudron 29d912eb82
Merge pull request #65558 from matthias-t/lean
Vim plugins for the lean theorem prover
2019-07-30 14:00:17 +09:00
worldofpeace 4eee184db4
Merge pull request #65541 from eadwu/vscode-extensions.ms-python.python/2019.6.24221
vscode-extensions.ms-python.python: 2019.6.22090 -> 2019.6.24221
2019-07-29 10:00:28 -04:00
Edmund Wu 49a6521dff
vscode-extensions.ms-python.python: 2019.6.22090 -> 2019.6.24221 2019-07-29 09:05:57 -04:00
Matthias Totschnig da5c9d54cd vimPlugins.vim-lean: init at 2017-07-29 2019-07-29 13:54:53 +02:00
Matthias Totschnig 33b2529c7d vimPlugins.lean-vim: init at 2017-05-03 2019-07-29 13:53:09 +02:00
worldofpeace 577150ff49
Merge pull request #65539 from eadwu/vscode-extensions.ms-vscode.cpptools/0.24.1
vscode-extensions.ms-vscode.cpptools: 0.24.0 -> 0.24.1
2019-07-29 04:25:25 -04:00
worldofpeace 3a91b36733
Merge pull request #65540 from eadwu/vscode-extensions.WakaTime.vscode-wakatime/2.2.0
vscode-extensions.WakaTime.vscode-wakatime: 2.1.2 -> 2.2.0
2019-07-29 04:20:31 -04:00
Tobias Happ 6016ec50c3 vimPlugins.gitignore-vim: init at 2014-03-16 2019-07-29 14:06:52 +09:00
Edmund Wu 3b645dc67f
vscode-extensions.WakaTime.vscode-wakatime: 2.1.2 -> 2.2.0 2019-07-28 21:47:58 -04:00
Edmund Wu a585e0d8fa
vscode-extensions.ms-vscode.cpptools: 0.24.0 -> 0.24.1 2019-07-28 21:47:16 -04:00
Jörg Thalheim 40c3d403d6
Merge pull request #65521 from Gerschtli/add/vim-hybrid-material
vimPlugins.vim-hybrid-material: init at 2018-11-12
2019-07-28 19:49:30 +01:00
Tobias Happ 5ae73cf14e vimPlugins.vim-hybrid-material: init at 2018-11-12 2019-07-28 20:45:02 +02:00
Tobias Happ c3dacc9095 vimPlugins.vim-tmux: init at 2019-03-22 2019-07-28 20:44:46 +02:00
Frederik Rietdijk cb3ce5d26d Merge master into staging-next 2019-07-28 12:11:37 +02:00
Michael Raskin 11ed5eba74
Merge pull request #65368 from ikervagyok/wine412
wine-{unstable,staging}: 4.9 -> 4.12.1
2019-07-28 07:10:59 +00:00
Frederik Rietdijk 0f6bda38fe Merge staging-next into staging 2019-07-26 14:45:31 +02:00
Jason Felice fd2b2b5cd5 tmux-ctrlw: init at 0.1.0 2019-07-25 22:39:43 +02:00
Tmplt a18fcd9115 vimPlugins.delimitMate: init at 2017-06-19 2019-07-25 21:29:04 +02:00
Tmplt cdd0a8d619 vimPlugins.vim-cpp-enhanced-highlight: init at 2019-07-01 2019-07-25 21:29:03 +02:00
Tmplt b617a8a129 vimPlugins.seoul256-vim: init at 2017-09-05 2019-07-25 21:29:03 +02:00
Tmplt 2b29c081ad vimPlugins: update plugins 2019-07-25 21:29:00 +02:00
Nick Hu 1d9d31a0eb tmuxPlugins.tmux-colors-solarized: init tmux plugin 2019-07-25 20:57:52 +02:00
Michael Raskin 22f5ee4e0e
Merge pull request #65305 from averelld/disable-zbar-wine-gstreamer
wine: disable zbar in gst-plugins-bad
2019-07-25 12:36:10 +00:00
Orivej Desh 32fbbc6f9b Merge master into staging 2019-07-25 09:23:21 +00:00
markuskowa 554b1e9dee
Merge pull request #65185 from r-ryantm/auto-update/sndio
sndio: 1.5.0 -> 1.6.0
2019-07-24 13:14:25 +02:00
Averell Dalton 9332773e51 wine: disable zbar in gst-plugins-bad 2019-07-23 16:30:56 +02:00
worldofpeace b1bc0645ea gdk-pixbuf: rename from gdk_pixbuf 2019-07-22 18:50:57 -04:00
Nazarii Bardiuk 828d2d52b0
vimPlugins.ghcid: Init at 2019-07-04 2019-07-22 19:06:05 +01:00
Nazarii Bardiuk d98aebfb9a
vimPlugins: Update 2019-07-22 18:42:34 +01:00
Delan Azabani d6e03ca5cf fxlinuxprint: init at 1.1.2-1 2019-07-22 17:10:17 +10:00
Lengyel Balazs a031a1f4b8 wine: 4.9 -> 4.12.1 2019-07-21 20:47:52 +02:00
Lengyel Balazs 8a83fb70d0 wine-mono: 4.8.3 -> 4.9.0 2019-07-21 20:47:01 +02:00
R. RyanTM 752874d0da sndio: 1.5.0 -> 1.6.0
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/sndio/versions
2019-07-20 11:53:01 -07:00
Timo Kaufmann 044bf77593
vimPlugins: update (#65165) 2019-07-20 17:03:54 +02:00
Graham Christensen 3f4ed94173
Merge pull request #64731 from risicle/ris-dosbox-0.74-3
dosbox: 0.74-2 -> 0.74-3, fixing CVE-2019-7165, CVE-2019-12594
2019-07-18 17:35:51 -04:00
Matthieu Coudron b0f0c75796
Merge pull request #64749 from malob/update-coc-nvim
vimPlugins.coc-nvim: 0.0.72 -> 0.0.73 (and change override)
2019-07-18 17:04:49 +02:00
Thomas Tuegel e740b88c00
Merge pull request #64722 from Yarny0/hplip
hplip: update version to 3.19.6, fix `hpcups` segfault, enable udev rule file
2019-07-17 14:27:16 -05:00
Ryan Mulligan 9b1f915136
Merge pull request #64938 from r-ryantm/auto-update/sc-controller
sc-controller: 0.4.6.1 -> 0.4.7
2019-07-16 20:12:43 -07:00
R. RyanTM 1cf88a612a sc-controller: 0.4.6.1 -> 0.4.7
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
2019-07-16 12:02:15 -07:00
Frederik Rietdijk a28a9ac156 Merge master into staging-next 2019-07-16 11:15:46 +02:00
Malo Bourgon 08986cac6c vimPlugins: Update (after removing coc.nvim from vim-plugin-names) 2019-07-15 10:56:09 -07:00
Malo Bourgon a23a09ba84 vimPlugins.coc-nvim: 0.0.72 -> 0.0.73 2019-07-15 10:50:10 -07:00
Ryan Mulligan 7136d830f9
Merge pull request #63234 from r-ryantm/auto-update/cups-filters
cups-filters: 1.23.0 -> 1.25.0
2019-07-15 07:42:53 -05:00
Michael Raskin 4a68d3bb79
Merge pull request #63817 from ambrop72/wine-wrapper-fix
wine: Set WINELOADER in wrapper, wrap also wine64.
2019-07-15 10:40:15 +00:00
Vladimír Čunát 3686036e02
Merge branch 'master' into staging-next
Hydra nixpkgs: ?compare=1530372
2019-07-15 09:39:03 +02:00
Malo Bourgon 5d69e5f84b Update documentation about adding new Vim plugins to nixpkgs 2019-07-14 17:13:29 -07:00
Robert Scott 428e215313 dosbox: 0.74-2 -> 0.74-3
fixes CVE-2019-7165, CVE-2019-12594
2019-07-14 12:39:15 +01:00
worldofpeace 696767a9c9
Merge pull request #55149 from eadwu/vscode-extensions.ms-python.python/2019.1.0
vscode-extensions.ms-python.python: 2018.12.1 -> 2019.6.22090
2019-07-14 05:22:00 -04:00
Yarny0 2daea2c81f hplip: retain udev rules in WithPlugin version
Beginning with commit 8ffd6af27e,
the build recipe for `hplipWithPlugin` explicitely drops a
udev rule file that is delivered with the sources.
In `hplip` (without plugin), the rule file is retained.

The udev rules takes care of uploading firmware
to certain printers (and maybe of other things),
e.g. to HP LaserJet 1000.

This commit reinstates the rule file and
expands the fixup script so that the rules
are also patched in the WithPlugin version.
2019-07-14 10:15:38 +02:00
Yarny0 5aafd1d0db hplip: udev rule: drop nohup instead of patching it
hplip's udev rule uses `nohup` to attempt to detach
its printer configuration script from the udev process.
However, this attempt is futile as udev
tracks its child processes with cgroups:
https://unix.stackexchange.com/a/243648

The hardcoded path to `nohup` was patched to use Nix' `nohup`.
This commit alters the patch script so
that it simply drops the call to `nohup`.
2019-07-14 10:15:38 +02:00
Yarny0 60311e0957 hplip: patch imageProcessor segfault in hpcups (#58949)
Beginning with version 3.18.7, `hpcups` fails with
> DEBUG: imageProcessorStartPage failed
and segfaults (tested with HP LaserJet 1000 printer).

Upstream bug reports:
* https://bugs.launchpad.net/hplip/+bug/1788706
* https://bugs.launchpad.net/hplip/+bug/1787289

There is a patch available in one of the reports:
https://bugs.launchpad.net/hplip/+bug/1787289/+attachment/5176026/+files/hplip.patch
It applies to 3.18.7, but not to later versions.

This commit adds a slight adaption of
the patch that applies to versions 3.18.9 -- 3.19.6.
The patch fixes https://github.com/NixOS/nixpkgs/issues/58949 .

Note that the patch is merely a workaround:
It simply removes all calls into the
ImageProcessor library from `HPCupsFilter.cpp`.
2019-07-14 10:15:06 +02:00
Timo Kaufmann 23a51a61d8
vimPlugins: update (#64696) 2019-07-13 12:12:40 +02:00
Yarny0 15aacfb450 hplip: 3.19.1 -> 3.19.6
Release notes:
https://developers.hp.com/hp-linux-imaging-and-printing/release_notes
2019-07-13 09:48:44 +02:00
Yarny0 1323930b7b hplip: add meta.downloadPage 2019-07-13 09:48:40 +02:00
Frederik Rietdijk 54065ae20d Merge master into staging-next 2019-07-13 09:45:40 +02:00
worldofpeace 63109c860f
Merge pull request #64376 from emmanuelrosa/betterlockscreen-missing-dependencies
betterlockscreen: add missing runtime dependencies
2019-07-11 10:33:24 -04:00
Emmanuel Rosa eb0332db39 betterlockscreen: add missing runtime dependencies 2019-07-11 10:33:07 -04:00