3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

2854 commits

Author SHA1 Message Date
Jörg Thalheim 60b5384780 vimPlugins.surround: fix typo (was sourround) 2018-04-09 09:20:01 +01:00
Matthew Justin Bauer e05cd54603
Merge pull request #38308 from ikervagyok/wine
wine: 3.4 -> 3.5
2018-04-08 21:29:20 -05:00
Jörg Thalheim 73df91ea37 vimPlugins.matchit-zip: remove unpack phase 2018-04-08 22:27:17 +01:00
Jörg Thalheim 77303e90a6 vimPlugins.cpsm: wants ncurses 2018-04-08 22:26:53 +01:00
Jörg Thalheim 99c27720ed vimPlugins: sort plugin name list alphabetically 2018-04-08 22:14:36 +01:00
Jörg Thalheim 260d90d936 vimPlugins: use github https links
git protocol is insecure and does not work behind proxies.
Therefore prefix github: before every name
2018-04-08 22:11:11 +01:00
Frederik Rietdijk 595a72589f Merge master into staging 2018-04-08 10:54:17 +02:00
Jörg Thalheim d6765af468
Merge pull request #38599 from r-ryantm/auto-update/adapta-gtk-theme
adapta-gtk-theme: 3.93.0.174 -> 3.93.0.225
2018-04-08 09:29:45 +01:00
R. RyanTM dfcbd477be adapta-gtk-theme: 3.93.0.174 -> 3.93.0.225
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/adapta-gtk-theme/versions.

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- directory tree listing: https://gist.github.com/3865bcde7ac7faabba940e89c5114260
2018-04-07 21:28:05 -07:00
Matthias Beyer ce1c1e3093 Remove maintainership
With this patch I remove myself as a maintainer for all packages I
currently maintain.

This is due the fact that I will be basically off the grid from May 2018
until early 2019, as I will be on a trip through north america.

I will revert this patch as soon as I'm back, as I plan to continue
contributing to nixpkgs then.
But as I cannot maintain anything during that time, I'd like to get this
patch merged.

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
2018-04-06 10:57:19 +02:00
Frederik Rietdijk a9f37d1c25 Merge master into staging 2018-04-05 19:25:05 +02:00
Corey O'Connor cbcb9eb909 wine: 3.4 -> 3.5 (and staging likewise) 2018-04-05 08:57:50 -07:00
Graham Christensen 8f33464ca7
nixos docs: syntax highlight
- Rectifies diverging CSS by combining
   nixos/nixpkgs docs CSS
 - Moves our custom Highlight.js loader in to
   the hljs package
 - Switches the nixos docs to use SVG
   callouts too
2018-04-05 07:54:01 -04:00
Frederik Rietdijk 23741692fa Merge master into staging 2018-04-04 19:36:39 +02:00
Guillaume Maudoux f338e4c3db cups-filters: remove myself from maintainers 2018-04-03 22:46:27 +02:00
adisbladis 729cd0352d
Merge pull request #38294 from r-ryantm/auto-update/cups-filters
cups-filters: 1.20.1 -> 1.20.2
2018-04-03 23:56:07 +08:00
Tuomas Tynkkynen 747ebe3f66 Merge remote-tracking branch 'upstream/master' into staging
Conflicts:
	pkgs/top-level/all-packages.nix
2018-04-03 02:22:54 +03:00
Lengyel Balazs 7e97675fa1 wine: 3.4 -> 3.5 2018-04-01 22:12:14 +02:00
R. RyanTM 37275927ae cups-filters: 1.20.1 -> 1.20.2
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

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

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 1.20.2 with grep in /nix/store/zbwgknzkhih8rlcizp4s5yi5kinjfv5w-cups-filters-1.20.2
- directory tree listing: https://gist.github.com/a1bcdc4c27ed6a03fa20b81303aaa036
2018-04-01 03:43:40 -07:00
Matthew Justin Bauer 6fe3202854
Merge pull request #38036 from romildo/upd.materia
materia-theme: 20180110 -> 20180321
2018-03-31 19:31:50 -05:00
Matthew Justin Bauer 3070e9263e
Merge pull request #37640 from coreyoconnor/retroarch-mame
libretro.mame: 2017-06-04 -> 2017-03-02
2018-03-31 19:19:13 -05:00
Robert Schütz f5755a2686
Merge pull request #38028 from Ma27/cleanup-frescobaldi
frescobaldi: 2.0.16 -> 3.0.0; fix build
2018-03-31 17:25:03 +02:00
Maximilian Bosch 545495b132
frescobaldi: 2.0.16 -> 3.0.0; fix build
3.0.0 works with Python 3 and QT5 (proivded by pyqt5). These fixes are
another step towards #32883 by getting rid of the unused poppler-qt4.

See https://hydra.nixos.org/build/71816154/log
See ticket #36453
2018-03-31 17:03:17 +02:00
Tad Fisher f54a02df4f light-locker: 1.7.0 -> 1.8.0 2018-03-30 23:45:33 +02:00
Vladimír Čunát 514e3e8a07
cups: fix patch download without a rebuild
One needs to specify git commit to make the fetch always work.
Close #38113.
2018-03-30 21:35:09 +02:00
Ryan Mulligan 3f3cefbc50 greybird: 3.22.6 -> 3.22.7
Semi-automatic update generated by https://github.com/ryantm/nix-update tools.

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

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- directory tree listing: https://gist.github.com/49f269acfed0477087452f5f821f1b20
2018-03-30 21:17:17 +02:00
Frederik Rietdijk 9d2ff98571 Merge remote-tracking branch 'upstream/master' into HEAD 2018-03-30 08:14:35 +02:00
José Romildo Malaquias 810fc24c35 materia-theme: 20180110 -> 20180321 2018-03-29 08:09:37 -03:00
Bastian Köcher 8152db99d7 hplip: Adds missing depdency sip 2018-03-29 11:29:44 +02:00
Shea Levy 05e375d710
Merge remote-tracking branch 'origin/master' into staging 2018-03-28 09:36:47 -04:00
Matthew Justin Bauer 75616ceb49
Merge pull request #37840 from matthewbauer/unixtools
Cross-platform "unixtools"
2018-03-27 18:43:03 -05:00
Graham Christensen a8d08b04a2
documentation-highlighter: init 2018-03-26 21:23:41 -04:00
Jan Malakhovski c7cf808ff8 libva: make libva-full the default
It seems that all uses of `libva` it in nixpkgs except `mesa` and itself actually
either will gain from using `libva-full` instead of `libva-minimal` by default
or simply won't care.
2018-03-26 14:02:06 +03:00
Nikolay Amiantov 6bf1421f13 treewide: refactor to use libglvnd
* Implement libGL as a symlink package which uses libraries from libglvnd and
  headers from Mesa (since ones from libglvnd are outdated).
* Use libGL_driver.driverLink treewide; add FHS paths where possible.
2018-03-26 14:01:49 +03:00
Jörg Thalheim 90cfaf1ab3
Merge pull request #37743 from ikervagyok/wine
wine: Unstable 3.3 -> 3.4 & reenable wineStaging
2018-03-26 10:10:28 +01:00
Matthew Justin Bauer 8f3091939b
Merge pull request #37752 from ryantm/fix-urls
treewide: use more HTTPS URLs
2018-03-25 00:40:17 -05:00
Ryan Mulligan b189247ba0 treewide: use more HTTPS URLs
Uses the HTTPS url for cases where the existing URL has a permanent
redirect. For each domain, at least one fixed derivation URL was
downloaded to test the domain is properly serving downloads.

Also fixes jbake source URL, which was broken.
2018-03-24 22:04:25 -07:00
Lengyel Balázs f8f067d627 wine: Unstable 3.3 -> 3.4 & reenable wineStaging 2018-03-24 22:26:51 +01:00
Tuomas Tynkkynen 50dc85ed62 U-Boot: Disable parallel build
https://hydra.nixos.org/build/71880710
2018-03-24 16:07:50 +02:00
Shea Levy 20f51922c0
riscv-pk: Set platforms properly 2018-03-24 08:44:26 -04:00
Tuomas Tynkkynen a2c37c0700 riscv-pk: Set correct platforms 2018-03-23 20:05:23 +02:00
Tuomas Tynkkynen bab5a0664c armTrustedFirmware: Disable parallel build
I think https://hydra.nixos.org/build/71541345 is parallel build
related.
2018-03-23 19:03:26 +02:00
Tuomas Tynkkynen 107eaa8780 armTrustedFirmwareQemu: 1.4 -> 1.5, fixes build with GCC7 2018-03-23 19:03:04 +02:00
Albert Safin ba960ac383 wine: disable bindnow hardening 2018-03-23 18:11:57 +02:00
Corey O'Connor 1a282a2ec7 libretro.mame: 2017-06-04 -> 2017-03-02 2018-03-22 10:55:44 -07:00
Matthew Justin Bauer e35105c7c8
Merge pull request #35081 from StijnDW/master
brlaser: init from latest git
2018-03-22 11:09:39 -05:00
Ryan Mulligan a75fcce8e8 adapta-gtk-theme: 3.93.0.1 -> 3.93.0.174
Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- directory tree listing: https://gist.github.com/06cdb7bbde8b5a7b86126b7c6f169357
2018-03-22 16:59:10 +01:00
Will Dietz 4ee6de5b1c
Merge pull request #37491 from dtzWill/update/vim-plugins-many-2018-03-20
vim-plugins: updates!
2018-03-21 15:56:37 -05:00
Yegor Timoshenko b46aea76e9
epsxe: remove duplicated with stdenv.lib; 2018-03-21 02:44:02 +00:00
Will Dietz 00fb7d29bf vim-plugins: updates!
Only updated the ones I have experience with,
so this is not exhaustive.
2018-03-20 15:48:50 -05:00
lewo ba96a902ad
Merge pull request #36988 from hschaeidt/stabber
stabber: init at 2016-11-09
2018-03-20 20:40:39 +01:00
Tuomas Tynkkynen a2d8a9aad7 armTrustedFirmware: Remove targetPlatforms like was done in U-Boot
Should also fix Hydra attempting to build this stuff on x86, like
https://hydra.nixos.org/build/71533289
2018-03-20 02:33:40 +02:00
Hendrik Schaeidt 6634049f22 stabber: init at 2016-11-09 2018-03-19 11:03:45 +01:00
Tuomas Tynkkynen 4fe75d11b2 U-Boot: Make ubootJetsonTK1 install even more files 2018-03-18 18:53:12 +02:00
Tuomas Tynkkynen 4b77663edf U-Boot: Add Pine64 build 2018-03-18 18:53:12 +02:00
Samuel Dionne-Riel 2ff31f71ae U-Boot: Add SOPINE Baseboard build
This build is compatible with PINE A64-LTS.

[dezgeg changed the original device tree patch to v4 of the patch series
"sunxi: sync H3, H5, A64 DTs from mainline Linux" submitted to the
upstream mailing list by Andre Przywara. Also install the
u-boot-sunxi-with-spl.bin binary similar to 32-bit boards
since it's now being built by the upstream build system.]
2018-03-18 18:53:12 +02:00
Samuel Dionne-Riel f2175e1bd4 arm-trusted-firmware: Inits at various versions
For qemu, at 1.4 from upstream.

For Sopine / Pine A64-LTS, at 1.0 from fork.
2018-03-18 18:53:12 +02:00
Tuomas Tynkkynen 6b069c656a U-Boot: Add AArch64 QEMU build
See

https://github.com/u-boot/u-boot/blob/master/doc/README.qemu-arm

on how to use it.
2018-03-18 18:53:12 +02:00
Ben Wolsieffer 28fd7d9594 uboot: fix cross-build of ubootTools 2018-03-18 18:53:12 +02:00
Ben Wolsieffer 01020b3263 uboot: sheevplug and guruplug: use mainline U-Boot
These derivations have not seen any updates since they were created in 2010,
and some of their sources have disappeared. There are upstream configs for
these boards, so these are now used, and they build correctly. I have no way
of testing them, and I don't if anyone even uses either board with Nix anymore.
2018-03-18 18:53:12 +02:00
Ben Wolsieffer ba3e470651 uboot: rock64: use binary blob for TPL
This stops the kernel from crashing immediately after boot.
2018-03-18 18:53:12 +02:00
Ben Wolsieffer 1f4bb8c61d uboot: add patch to increase maximum path length in extlinux.conf
This fixes problems with cross compiled kernels failing to boot.
2018-03-18 18:53:12 +02:00
Ben Wolsieffer 0ab76c5a4e arm-trusted-firmware: init
ARM trusted firmware is required as part of the boot process on some ARMv8-A
boards. Currently, only the RK3328 is supported in nixpkgs.

This makes the Rock64 u-boot image bootable.
2018-03-18 18:53:12 +02:00
Ben Wolsieffer 6f5a0bded2 uboot: add Rock64 support
The bootloader is currently non-functional because it lacks the ARM Trusted
Firmware image (bl31.elf).
2018-03-18 18:53:12 +02:00
Ben Wolsieffer 5804547243 uboot: 2017.11 -> 2018.03, cross fixes 2018-03-18 18:53:11 +02:00
Jörg Thalheim 6ff341dee5
Merge pull request #37064 from coreyoconnor/wine-correct-install-order
wine: correct install order for WoW wine build.
2018-03-18 12:46:21 +00:00
Sébastien Maccagnoni c0866e1990 calaos_installer: init at 3.1 2018-03-18 11:53:41 +01:00
Ryan Mulligan ad7bd4c7a3 jack1: 0.124.1 -> 0.125.0
Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/h64aj4vry98w3pmdqbd1bqkhxnghbvgb-jack1-0.125.0/bin/jackd -V` and found version 0.125.0
- ran `/nix/store/h64aj4vry98w3pmdqbd1bqkhxnghbvgb-jack1-0.125.0/bin/jackd --version` and found version 0.125.0
- ran `/nix/store/h64aj4vry98w3pmdqbd1bqkhxnghbvgb-jack1-0.125.0/bin/jack_server_control -h` got 0 exit code
- ran `/nix/store/h64aj4vry98w3pmdqbd1bqkhxnghbvgb-jack1-0.125.0/bin/jack_server_control -V` and found version 0.125.0
- ran `/nix/store/h64aj4vry98w3pmdqbd1bqkhxnghbvgb-jack1-0.125.0/bin/jack_server_control -v` and found version 0.125.0
- ran `/nix/store/h64aj4vry98w3pmdqbd1bqkhxnghbvgb-jack1-0.125.0/bin/jack_server_control -h` and found version 0.125.0
- ran `/nix/store/h64aj4vry98w3pmdqbd1bqkhxnghbvgb-jack1-0.125.0/bin/jack_midi_dump -h` got 0 exit code
- found 0.125.0 with grep in /nix/store/h64aj4vry98w3pmdqbd1bqkhxnghbvgb-jack1-0.125.0
- directory tree listing: https://gist.github.com/359dc1584108a662b645c49abe027c95
2018-03-16 18:07:08 -07:00
Ryan Mulligan 5c0645fe94 cups-filters: 1.20.0 -> 1.20.1
Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 1.20.1 with grep in /nix/store/233chsllrfymrvizn74nf8sav0r0llrb-cups-filters-1.20.1
2018-03-16 06:10:55 -07:00
Tuomas Tynkkynen ef64208eba Merge commit '3ab2949' from staging into master
Conflicts:
	pkgs/development/compilers/llvm/6/llvm.nix
	pkgs/servers/home-assistant/component-packages.nix
2018-03-15 22:30:56 +02:00
Peter Simons 3369c0da5e
Revert "splix: move to DRVs over PPDs" 2018-03-15 17:45:47 +01:00
Peter Simons 13e74a838d
Merge pull request #37048 from abbradar/splix
splix: move to DRVs over PPDs
2018-03-15 16:35:41 +01:00
Corey O'Connor 7f112e37d1 wine: correct install order for WoW wine build.
Per the wiki at https://wiki.winehq.org/Building_Wine#Shared_WoW64

"if you do choose to install your WoW64 build, you should run make
install in the 32-bit build tree first, then in the 64-bit one."

This is required, for instance, for the resulting "wineserver"
executable to be the 64 bit variant not 32 bit. Which is expected by the
binary loader for WoW64.

This odd dependency is vaguely mentioned on the packaging wiki page:

* https://wiki.winehq.org/Packaging#Binaries
2018-03-14 21:10:12 -07:00
Nikolay Amiantov 6b2d303b06 splix: move to DRVs over PPDs
Also enable JBIG support for newer printers.
2018-03-15 04:13:03 +03:00
John Ericson 2e87550ace
Merge pull request #36985 from obsidiansystems/no-allBut
treewide: get rid of platforms.allBut
2018-03-14 18:57:28 -04:00
John Ericson f79f80dbf2 treewide: get rid of platforms.allBut
Negative reasoning like `allBut` is a bad idea with an open world of
platforms. Concretely, if we add a new, quite different sort of
platform, existing packages with `allBut` will claim they work on it
even though they probably won't.
2018-03-14 18:44:42 -04:00
Tuomas Tynkkynen 2fec9c6e29 Merge remote-tracking branch 'upstream/master' into staging
Conflicts:
	pkgs/development/tools/build-managers/conan/default.nix
2018-03-13 23:04:18 +02:00
Franz Pletz 50fdcd414e
Merge pull request #36888 from volth/xfce-naming
xfce: do not use old names
2018-03-13 18:44:59 +00:00
Michael Raskin 9f4aaf11bd
Merge pull request #36891 from volth/aliases-2
treewide: s/saneBackends/sane-backends/g
2018-03-13 14:12:29 +00:00
volth 34f12184cd treewide: s/saneBackends/sane-backends/g 2018-03-13 00:47:10 +00:00
Franz Pletz 2c9d2d6526
nodePackages: fix evaluation
Introduced in 40e3ad60aa.
2018-03-13 00:44:41 +01:00
John Ericson 62ca2316a4
Merge pull request #36885 from obsidiansystems/meta-host-prepare
treewide: Prepare for #34444
2018-03-12 19:06:35 -04:00
volth fe70fbdefe xfce: do not use old names 2018-03-12 23:01:06 +00:00
John Ericson 79d8353b5e treewide: Make shouldUsePackages copypasta use meta.available
The old way depended on old list-of-strings `meta.platforms`, and was
not good for cross.
2018-03-12 18:55:41 -04:00
Nikolay Amiantov bef8321f9f kega-fusion: init at 3.63x 2018-03-13 01:08:50 +03:00
Franz Pletz 07f908f56f
Merge pull request #36863 from sveitser/vim-solidity
vim-solidity: init at 2018-02-11
2018-03-12 21:41:05 +00:00
Vladyslav M be6d9e1e69 hplip: 3.17.10 -> 3.17.11 2018-03-12 21:48:45 +02:00
Mathis Antony 1beda3fc6c vim-solidity: init at 2018-02-11 2018-03-12 23:17:03 +08:00
Rok Garbas bf25a02027 vimPlugins: updating all vim plugings 2018-03-12 13:30:58 +01:00
John Children 31db03ea14 LanguageClient-neovim: 2017-12-05 -> 2018-03-06
Following up from issue #33391, building LanguageClient-neovim now
requires some rust dependencies. This patch makes the plugin now longer
listed in vim-plugin-names file so that it will not be automatically
generated and instead lists it in non-generated plugins.

Also adds rustPlatform to arguments for vim plugins set.
2018-03-12 13:30:58 +01:00
pjan vandaele 3f5b03551f
adds tmuxPlugins 2018-03-11 17:47:36 +09:00
Moritz Maxeiner 12a70fd571 Remove myself as maintainer 2018-03-11 00:46:41 +01:00
Jan Malakhovski 7079e744d4 Merge branch 'master' into staging
Resolved the following conflicts (by carefully applying patches from the both
branches since the fork point):

   pkgs/development/libraries/epoxy/default.nix
   pkgs/development/libraries/gtk+/3.x.nix
   pkgs/development/python-modules/asgiref/default.nix
   pkgs/development/python-modules/daphne/default.nix
   pkgs/os-specific/linux/systemd/default.nix
2018-03-10 20:38:13 +00:00
Michael Raskin 00d6d772e5
Merge pull request #35057 from bignaux/qmc2
qmc2 : init at 0.195
2018-03-10 13:07:45 +00:00
Michael Raskin f74251dc92
Merge pull request #36657 from oxij/pkgs/pre-cardiacarrest
prepare for a swtich to `libcardiacarrest`
2018-03-09 22:03:01 +00:00
Jan Malakhovski 0b60cb9310 libcardiacarrest: init at 11.0-6 2018-03-09 20:49:30 +00:00
Jan Malakhovski 82c6426916 apulse: 0.1.11 -> 0.1.11 git, enable tracing by default
This adds LOG_TO_STDERR support and uses it for tracing.
2018-03-09 20:48:24 +00:00
Jan Malakhovski 2af121e687 libpressureaudio: better descriptions 2018-03-09 15:29:29 +00:00
Nikolay Amiantov 9983c7004b citra: disable on AArch64
Wants SSE2 instructions.
2018-03-09 16:35:10 +03:00
Bignaux Ronan a611114b46 qmc2 : init at 0.195 2018-03-08 21:55:56 +01:00
Daiderd Jordan f2661ed72b
libjack2: remove clang patch
/cc ZHF #36454
2018-03-08 21:24:37 +01:00
Vladimír Čunát 71f899c2c3
Merge #34461: mesa -> libGL* rename
This will just bit rot otherwise.  Almost nothing gets rebuilt.
2018-03-05 14:59:40 +01:00
Vladimír Čunát 565bd805e6
Merge branch 'master' 2018-03-05 14:53:27 +01:00
Herwig Hochleitner 039428d3b2 wine: 3.0 -> 3.3 2018-03-05 14:06:43 +01:00
Bignaux Ronan 7bffe53aea caprice32 : init at unstable-2018-02-10 (#35008) 2018-03-04 22:51:15 +00:00
Daiderd Jordan 95eb92a22a
Merge pull request #36237 from DarkScythe97/retroarch
retroarch: 1.6.0 -> 1.7.1
2018-03-04 21:47:40 +01:00
DarkScythe97 6a92260227
retroarch: fix darwin build 2018-03-04 21:25:56 +01:00
DarkScythe97 799178fe45 libretro: add higan-sfc core (#36238) 2018-03-04 05:39:18 +00:00
Ruben Maher 688aaf10fb desmume: avoid errors with with -fpermissive
Prior to this change, desmume would fail to build due to an error:

utils/libfat/directory.cpp:142:33: error: ISO C++ forbids comparison between
  pointer and integer [-fpermissive]
2018-03-04 13:43:40 +10:30
Tuomas Tynkkynen 1e107443ad Merge commit '618ac29687a650d854c8bea7efd4490387589ce2' into staging 2018-03-03 22:40:32 +02:00
Jörg Thalheim 33c5d78300
Merge pull request #36163 from romildo/new.deepin
deepin: add meta package for the Deepin Desktop Environment (DDE)
2018-03-03 19:02:12 +00:00
Mitsuhiro Nakamura 1fa28ae95d [RDY] skim: init at 0.3.2 (#33561) 2018-03-03 15:39:16 +00:00
DarkScythe97 e604a3175d retroarch: 1.6.0 -> 1.7.1 2018-03-03 12:39:35 +10:30
DarkScythe97 e21aa3baef libretro: specify license per core 2018-03-02 10:41:16 +10:30
José Romildo Malaquias 562031d815 deepin-gtk-theme: move to deepin meta package 2018-03-01 10:00:05 -03:00
Tuomas Tynkkynen b8b2225f6b Merge remote-tracking branch 'upstream/master' into staging 2018-03-01 06:09:20 +02:00
rnhmjoj c1a95842d1
sc-controller: 0.4.0.2 -> 0.4.1 2018-03-01 00:28:46 +01:00
Tuomas Tynkkynen 34f95d92a2 Merge remote-tracking branch 'upstream/master' into staging
Conflicts:
	pkgs/applications/misc/pytrainer/default.nix
	pkgs/development/tools/pew/default.nix
	pkgs/tools/misc/you-get/default.nix
2018-02-28 20:52:49 +02:00
José Romildo Malaquias a765ccaf14 zuki-themes: 3.24-3 -> 3.26-1 2018-02-28 13:46:30 -03:00
Ryan Mulligan ba5b0a5f59 sc-controller: 0.4.0.1 -> 0.4.0.2
Semi-automatic update. These checks were performed:

- built on NixOS
- ran `/nix/store/yjhdx3zx9zivz9x2wl2z0c5kqv8b5hkv-sc-controller-0.4.0.2/bin/sc-controller -h` got 0 exit code
- ran `/nix/store/yjhdx3zx9zivz9x2wl2z0c5kqv8b5hkv-sc-controller-0.4.0.2/bin/sc-controller --help` got 0 exit code
- ran `/nix/store/yjhdx3zx9zivz9x2wl2z0c5kqv8b5hkv-sc-controller-0.4.0.2/bin/sc-controller -V` and found version 0.4.0.2
- ran `/nix/store/yjhdx3zx9zivz9x2wl2z0c5kqv8b5hkv-sc-controller-0.4.0.2/bin/sc-controller --version` and found version 0.4.0.2
- ran `/nix/store/yjhdx3zx9zivz9x2wl2z0c5kqv8b5hkv-sc-controller-0.4.0.2/bin/scc -h` got 0 exit code
- ran `/nix/store/yjhdx3zx9zivz9x2wl2z0c5kqv8b5hkv-sc-controller-0.4.0.2/bin/scc --help` got 0 exit code
- ran `/nix/store/yjhdx3zx9zivz9x2wl2z0c5kqv8b5hkv-sc-controller-0.4.0.2/bin/scc help` got 0 exit code
- ran `/nix/store/yjhdx3zx9zivz9x2wl2z0c5kqv8b5hkv-sc-controller-0.4.0.2/bin/scc -V` and found version 0.4.0.2
- ran `/nix/store/yjhdx3zx9zivz9x2wl2z0c5kqv8b5hkv-sc-controller-0.4.0.2/bin/scc --version` and found version 0.4.0.2
- ran `/nix/store/yjhdx3zx9zivz9x2wl2z0c5kqv8b5hkv-sc-controller-0.4.0.2/bin/scc version` and found version 0.4.0.2
- ran `/nix/store/yjhdx3zx9zivz9x2wl2z0c5kqv8b5hkv-sc-controller-0.4.0.2/bin/scc -h` and found version 0.4.0.2
- ran `/nix/store/yjhdx3zx9zivz9x2wl2z0c5kqv8b5hkv-sc-controller-0.4.0.2/bin/scc --help` and found version 0.4.0.2
- ran `/nix/store/yjhdx3zx9zivz9x2wl2z0c5kqv8b5hkv-sc-controller-0.4.0.2/bin/scc help` and found version 0.4.0.2
- ran `/nix/store/yjhdx3zx9zivz9x2wl2z0c5kqv8b5hkv-sc-controller-0.4.0.2/bin/scc-daemon -h` got 0 exit code
- ran `/nix/store/yjhdx3zx9zivz9x2wl2z0c5kqv8b5hkv-sc-controller-0.4.0.2/bin/scc-daemon --help` got 0 exit code
- ran `/nix/store/yjhdx3zx9zivz9x2wl2z0c5kqv8b5hkv-sc-controller-0.4.0.2/bin/..scc-wrapped-wrapped -h` got 0 exit code
- ran `/nix/store/yjhdx3zx9zivz9x2wl2z0c5kqv8b5hkv-sc-controller-0.4.0.2/bin/..scc-wrapped-wrapped --help` got 0 exit code
- ran `/nix/store/yjhdx3zx9zivz9x2wl2z0c5kqv8b5hkv-sc-controller-0.4.0.2/bin/..scc-wrapped-wrapped help` got 0 exit code
- ran `/nix/store/yjhdx3zx9zivz9x2wl2z0c5kqv8b5hkv-sc-controller-0.4.0.2/bin/..scc-wrapped-wrapped -V` and found version 0.4.0.2
- ran `/nix/store/yjhdx3zx9zivz9x2wl2z0c5kqv8b5hkv-sc-controller-0.4.0.2/bin/..scc-wrapped-wrapped --version` and found version 0.4.0.2
- ran `/nix/store/yjhdx3zx9zivz9x2wl2z0c5kqv8b5hkv-sc-controller-0.4.0.2/bin/..scc-wrapped-wrapped version` and found version 0.4.0.2
- ran `/nix/store/yjhdx3zx9zivz9x2wl2z0c5kqv8b5hkv-sc-controller-0.4.0.2/bin/..scc-wrapped-wrapped -h` and found version 0.4.0.2
- ran `/nix/store/yjhdx3zx9zivz9x2wl2z0c5kqv8b5hkv-sc-controller-0.4.0.2/bin/..scc-wrapped-wrapped --help` and found version 0.4.0.2
- ran `/nix/store/yjhdx3zx9zivz9x2wl2z0c5kqv8b5hkv-sc-controller-0.4.0.2/bin/..scc-wrapped-wrapped help` and found version 0.4.0.2
- ran `/nix/store/yjhdx3zx9zivz9x2wl2z0c5kqv8b5hkv-sc-controller-0.4.0.2/bin/.scc-wrapped -h` got 0 exit code
- ran `/nix/store/yjhdx3zx9zivz9x2wl2z0c5kqv8b5hkv-sc-controller-0.4.0.2/bin/.scc-wrapped --help` got 0 exit code
- ran `/nix/store/yjhdx3zx9zivz9x2wl2z0c5kqv8b5hkv-sc-controller-0.4.0.2/bin/.scc-wrapped help` got 0 exit code
- ran `/nix/store/yjhdx3zx9zivz9x2wl2z0c5kqv8b5hkv-sc-controller-0.4.0.2/bin/.scc-wrapped -V` and found version 0.4.0.2
- ran `/nix/store/yjhdx3zx9zivz9x2wl2z0c5kqv8b5hkv-sc-controller-0.4.0.2/bin/.scc-wrapped --version` and found version 0.4.0.2
- ran `/nix/store/yjhdx3zx9zivz9x2wl2z0c5kqv8b5hkv-sc-controller-0.4.0.2/bin/.scc-wrapped version` and found version 0.4.0.2
- ran `/nix/store/yjhdx3zx9zivz9x2wl2z0c5kqv8b5hkv-sc-controller-0.4.0.2/bin/.scc-wrapped -h` and found version 0.4.0.2
- ran `/nix/store/yjhdx3zx9zivz9x2wl2z0c5kqv8b5hkv-sc-controller-0.4.0.2/bin/.scc-wrapped --help` and found version 0.4.0.2
- ran `/nix/store/yjhdx3zx9zivz9x2wl2z0c5kqv8b5hkv-sc-controller-0.4.0.2/bin/.scc-wrapped help` and found version 0.4.0.2
- found 0.4.0.2 with grep in /nix/store/yjhdx3zx9zivz9x2wl2z0c5kqv8b5hkv-sc-controller-0.4.0.2

cc "@orivej"
2018-02-28 11:31:29 +01:00
Bignaux Ronan dbb22dd1d6
xcpc: init at 20070122 2018-02-27 19:07:00 +01:00
Bignaux Ronan 2b7e912c57
libdsk: init at 1.5.8 2018-02-27 19:07:00 +01:00
Frederik Rietdijk d10c201252 Merge remote-tracking branch 'upstream/master' into HEAD 2018-02-27 16:22:37 +01:00
Jörg Thalheim 21ea4e4728
Merge pull request #35838 from kamilchm/vim-git-gutter
vim-gitgutter: 2017-11-01 -> 2018-02-26
2018-02-27 12:38:58 +00:00
Jörg Thalheim 9a6b5d4302
Merge pull request #35837 from kamilchm/vim-ale
vim-plugins: ale: 2017-12-04 -> 2018-02-25
2018-02-27 12:15:33 +00:00
Kamil Chmielewski 0c58c829ba vim-gitgutter: 2017-11-01 -> 2018-02-26 2018-02-27 11:17:19 +01:00
Kamil Chmielewski 97de154631 vim-plugins: ale: 2017-12-04 -> 2018-02-25 2018-02-27 11:14:05 +01:00
Frederik Rietdijk ad5127c417 Merge remote-tracking branch 'upstream/master' into HEAD 2018-02-27 09:18:49 +01:00
Ryan Mulligan 9d26713675 hatari: 1.8.0 -> 2.1.0
Semi-automatic update. These checks were performed:

- built on NixOS
- ran `/nix/store/9fnkx4rgnai6qvkqdwyhx9824xqdqawf-hatari-2.1.0/bin/hmsa -h` got 0 exit code
- ran `/nix/store/9fnkx4rgnai6qvkqdwyhx9824xqdqawf-hatari-2.1.0/bin/hmsa --help` got 0 exit code
- ran `/nix/store/9fnkx4rgnai6qvkqdwyhx9824xqdqawf-hatari-2.1.0/bin/hmsa -V` and found version 2.1.0
- ran `/nix/store/9fnkx4rgnai6qvkqdwyhx9824xqdqawf-hatari-2.1.0/bin/hmsa -v` and found version 2.1.0
- ran `/nix/store/9fnkx4rgnai6qvkqdwyhx9824xqdqawf-hatari-2.1.0/bin/hmsa --version` and found version 2.1.0
- ran `/nix/store/9fnkx4rgnai6qvkqdwyhx9824xqdqawf-hatari-2.1.0/bin/hmsa -h` and found version 2.1.0
- ran `/nix/store/9fnkx4rgnai6qvkqdwyhx9824xqdqawf-hatari-2.1.0/bin/hmsa --help` and found version 2.1.0
- found 2.1.0 with grep in /nix/store/9fnkx4rgnai6qvkqdwyhx9824xqdqawf-hatari-2.1.0
- found 2.1.0 in filename of file in /nix/store/9fnkx4rgnai6qvkqdwyhx9824xqdqawf-hatari-2.1.0

cc "@fuuzetsu"
2018-02-26 18:19:24 -08:00
Frederik Rietdijk 4f08b0fbac Merge remote-tracking branch 'upstream/master' into HEAD 2018-02-26 10:50:18 +01:00
adisbladis 424e2afefe
Merge pull request #35641 from ryantm/auto-update/fceux-2.2.2-to-2.2.3
fceux: 2.2.2 -> 2.2.3
2018-02-26 15:22:43 +08:00
Ryan Mulligan 716825a090 fceux: 2.2.2 -> 2.2.3
Semi-automatic update. These checks were performed:

- built on NixOS
- ran `/nix/store/27q1wf9bs3qp60l2q0b2pyzf6ykijarj-fceux-2.2.3/bin/fceux -h` got 0 exit code
- ran `/nix/store/27q1wf9bs3qp60l2q0b2pyzf6ykijarj-fceux-2.2.3/bin/fceux --help` got 0 exit code
- ran `/nix/store/27q1wf9bs3qp60l2q0b2pyzf6ykijarj-fceux-2.2.3/bin/fceux -h` and found version 2.2.3
- ran `/nix/store/27q1wf9bs3qp60l2q0b2pyzf6ykijarj-fceux-2.2.3/bin/fceux --help` and found version 2.2.3
- found 2.2.3 with grep in /nix/store/27q1wf9bs3qp60l2q0b2pyzf6ykijarj-fceux-2.2.3
- found 2.2.3 in filename of file in /nix/store/27q1wf9bs3qp60l2q0b2pyzf6ykijarj-fceux-2.2.3
2018-02-25 21:20:22 -08:00
Frederik Rietdijk 8645a1b69d
Merge pull request #35553 from LnL7/vim-nix
vim-nix: 2017-04-30 -> 2018-02-25
2018-02-25 20:37:58 +00:00
Nikolay Amiantov cbe5143a69 citra: 2018-01-24 -> 2018-02-23 2018-02-25 22:24:09 +03:00
Jan Tojnar a31d98f312
tree-wide: autorename gnome packages to use dashes 2018-02-25 17:41:16 +01:00
Daiderd Jordan e03bae0f0c
vim-nix: 2017-04-30 -> 2018-02-25 2018-02-25 17:09:36 +01:00
Nikolay Amiantov 6850418426 rpcs3: init at 2018-02-23 2018-02-25 01:48:23 +03:00
Vladimír Čunát e719327694
Merge #35113: cups: upstream patch for a bug 2018-02-24 22:30:18 +01:00
Alexander V. Nikolaev 0acec7e984 treewide: transition mesa to libGLU_combined 2018-02-24 17:06:49 +02:00
Alexander V. Nikolaev 1bc1909e5b treewide: transition from mesa_glu to libGLU 2018-02-24 17:05:43 +02:00
Alexander V. Nikolaev 8f2a22935c treewide: transition from mesa_noglu to libGL 2018-02-24 17:03:46 +02:00
Tuomas Tynkkynen ae9d4faff9 Merge remote-tracking branch 'upstream/master' into staging 2018-02-24 02:05:30 +02:00
Jörg Thalheim 1fbf33b78e zj-58: nitpicks 2018-02-23 16:38:26 +00:00
Nikolay Amiantov 998fdfdc94 cups: fix path to socket and run directory
We use default /var/run/cups/cups.sock in NixOS but here it's misdefined to be
/run/cups.sock. Return it to default.
2018-02-23 18:51:37 +03:00
makefu 7ca25bdfcf
cups-zj-58: init at 2018-02-22
Adds cups drivers for Zjiang ZJ-58
2018-02-23 16:47:52 +01:00
Nikolay Amiantov dccf85a354 Revert "cups: fix path to socket and run directory"
This reverts commit 34a37c5e94.
2018-02-23 18:47:35 +03:00
Nikolay Amiantov 34a37c5e94 cups: fix path to socket and run directory
We use default /var/run/cups/cups.sock in NixOS but here it's misdefined to be
/run/cups.sock. Return it to default.
2018-02-23 18:43:51 +03:00
wisut hantanong 317da085aa winetricks: 20171222 -> 20180217 2018-02-23 14:41:52 +07:00
Jörg Thalheim d4385d7fc3
Merge pull request #35134 from xeji/mfcl2720dw
mfcl2720dwlpr / mfcl2720dwcupswrapper: init at 3.2.0-1
2018-02-21 10:28:24 +00:00
Marcus Brinkmann 3d0b2f1e63 foo2zjs: 20110210 -> 20171202 (#32812) 2018-02-20 19:25:07 +00:00