3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

2674 commits

Author SHA1 Message Date
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
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