1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-27 08:01:14 +00:00
Commit graph

1920 commits

Author SHA1 Message Date
Tuomas Tynkkynen 8a4d6516ee Merge remote-tracking branch 'upstream/staging' into master 2016-11-30 00:34:23 +02:00
Tuomas Tynkkynen 02e1846d62 U-Boot: 2016.05 -> 2016.11 2016-11-28 00:23:12 +02:00
Vladimír Čunát 925b335607
Merge branch 'master' into staging 2016-11-26 11:27:09 +01:00
romildo a357777fc0 Greybird: 2016-09-13 -> 2016-11-15 2016-11-25 05:08:03 -02:00
Frederik Rietdijk 12d9fe12f0 urbit: use python2 2016-11-24 22:28:03 +01:00
Arseniy Seroka 39a0d766db Merge pull request #20678 from carlsverre/fix/ctrlp-cmatcher
Fix/ctrlp cmatcher
2016-11-24 22:53:15 +04:00
Arseniy Seroka c8e014e5a6 Merge pull request #20681 from carlsverre/add/cpsm
cpsm: init at 565ab53a66fa52c46d80adf6981b07f4bdffcb1d
2016-11-24 22:52:15 +04:00
Carl Sverre a7500ca12b cpsm: init at 565ab53a66fa52c46d80adf6981b07f4bdffcb1d 2016-11-24 00:16:24 -08:00
Carl Sverre 1d45e5d6c7 fix/ctrlp-cmatcher: add extra steps to additional-nix-code 2016-11-23 23:53:32 -08:00
Nikolay Amiantov be95ceaff2 treewide: quote URLs in my packages 2016-11-24 01:17:52 +03:00
Pascal Wittmann 703deb0bc0
slock: 1.3 -> 1.4
fixes CVE-2016-6866
2016-11-20 15:12:04 +01:00
Arseniy Seroka 57260d4c79 Merge pull request #20483 from steveeJ/vim-plugins-deoplete-go
vim-plugins/deoplete-go: init at 2016-11-12
2016-11-18 23:35:21 +04:00
Michael Raskin fd0d7229ff Merge pull request #20519 from avnik/wine-update
wine-unstable: 1.9.22 -> 1.9.23
2016-11-18 11:22:19 +00:00
Alexander V. Nikolaev edcfa0f3fa wine-unstable: 1.9.22 -> 1.9.23 2016-11-18 13:16:02 +02:00
Pascal Wittmann ec6e4689ea xlockmore: 5.47 -> 5.49 2016-11-17 22:34:03 +01:00
Stefan Junker da23970660 vim-plugins/deoplete-go: init at 2016-11-12 2016-11-17 18:23:33 +01:00
Jaka Hudoklin f4780da125 vimPlugins/vim-jsdoc: init at 0kr4p01p 2016-11-17 13:07:38 +01:00
Joe Hermaszewski d6a3aaef89 vim-utils: fix typo 2016-11-13 12:07:10 +00:00
James Cunningham 5dee508acf vim plugins: add dracula theme 2016-11-10 16:24:45 +00:00
Arseniy Seroka d4d2e7fd9e Merge pull request #20237 from vcunat/p/vim-fixes
vim fixes
2016-11-09 12:22:45 +03:00
Vladimír Čunát 8e86d3d451 vim-plugins: add clighter8 2016-11-07 20:21:42 +01:00
Vladimír Čunát d8652a053b vimPlugins: auto-update
- Rename couldn't be fetched; new URL should be OK.
- Two plugins got re-ordered (added ad-hoc, apparently).
- ctrlp* is suspected to contain non-generated code;
  I left it untouched this round but it should be fixed.
  /cc @carlsverre for 71a94dfd9
2016-11-07 18:55:21 +01:00
Bart Brouns 78121c2118 build jack unstable without profiling 2016-11-07 12:59:05 +01:00
Michael Raskin 4bfa6989f0 wineUnstable: 1.9.20 -> 1.9.22 2016-11-04 08:58:17 +01:00
Alexander V. Nikolaev d89c3acced wineUnstable: 1.9.20 -> 1.9.22
Also update staging as well
2016-11-04 06:04:15 +02:00
Kier Davis 9f4114a740
samsung-unified-linux-driver_1_00_37: fix build failing due to upstream change in 'cups'
This commit should fix the package building to build due to https://github.com/NixOS/nixpkgs/issues/16238

Printing tested on M2875FD and M2675FN models. Scanning not tested yet due to lack of access of Samsung scanning devices.

All work in this commit is attributed to @jokogr. Content of this commit is basically copied+pasted from c41e771a38
2016-11-02 15:13:46 +00:00
Frederik Rietdijk 84174c0cb8 libjack2Unstable: and remove the old file
that I forgot to stage.
2016-11-02 14:54:48 +01:00
Frederik Rietdijk ab0ac18279 libjack2Unstable: fix evaluation
broken by f64933596c
2016-11-02 14:20:58 +01:00
Bart Brouns d315ca4080 libjack2-git: 2015-09-03 -> 2016-08-18 2016-11-02 12:51:22 +01:00
Ioannis Koutras 270365a1ee samsung-unified-linux-driver: add 4.01.17 2016-11-01 19:19:53 +02:00
Dan Peebles 89915f8206 db45: remove outdated version 2016-11-01 03:10:13 +00:00
Frederik Rietdijk beef906d2e Merge pull request #19882 from FRidh/hplip
hplip: use mkPythonDerivation
2016-10-28 20:00:08 +02:00
Frederik Rietdijk 7077a270bf Merge remote-tracking branch 'upstream/master' into HEAD 2016-10-26 13:06:43 +02:00
Frederik Rietdijk d9c7a14c6a hplip: use mkPythonDerivation
since hplip is a Python package that doesn't use setuptools. Note that a
setup.py is provided, however, using buildPythonPackage fails.
2016-10-26 10:46:53 +02:00
Jaka Hudoklin 48c94846c9 vim-plugins/editorconfig-vim: init at a459b8 2016-10-23 17:27:32 +02:00
Jaka Hudoklin 3ba12b3333 vim-plugins/auto-pairs: init at 1b3a1efb 2016-10-23 17:27:24 +02:00
Alexander Ried 459da7b86e gnome3: default to 3.22 (#19743)
* gnome3: default to 3.22

* zuki-themes: add src for gnome 3.22, remove 3.18

* gnome3_22.vte_290: copy from gnome3.20

* termite: use vte-select-text from gnome3_20
2016-10-22 19:54:20 +02:00
Frederik Rietdijk e56832d730 Merge remote-tracking branch 'upstream/master' into HEAD 2016-10-22 17:23:24 +02:00
Vladimír Čunát 4d5b893002 Merge #19081: gnome-3.22
Also master commits are brought in.
2016-10-20 23:04:10 +02:00
Graham Christensen 8d9a2c191f Merge pull request #19681 from grahamc/ghostscript
ghostscript: 9.18 -> 9.20 for multiple CVEs
2016-10-19 20:58:45 -04:00
Graham Christensen 3c2306e216
ghostscript: 9.18 -> 9.20 for multiple CVEs: https://lwn.net/Vulnerabilities/703324/ 2016-10-19 08:09:17 -04:00
Frederik Rietdijk 481eea3280 lilypond: use python2 2016-10-18 23:16:09 +02:00
Frederik Rietdijk e7834d4ed9 jack2Full: use python2 2016-10-18 23:14:34 +02:00
Ram Kromberg 1e290ae75f mfcj6510dw: init at 3.0.0-1 2016-10-15 18:57:37 +03:00
romildo b59b353d4d theme-vertex: revert package renaming 2016-10-14 14:27:50 -03:00
Tim Steinbach 24de66ce48 Merge pull request #19541 from romildo/upd.themes
vertex-theme: 20160329 -> 20161009
2016-10-14 09:28:05 -04:00
romildo 6eef45e58e arc-theme: 2016-06-06 -> 2016-10-13 2016-10-14 06:59:55 -03:00
romildo 6ed72b2c1a vertex-theme: 20160329 -> 20161009 2016-10-14 06:38:30 -03:00
Vladimír Čunát 6eeea6effd Python: more evaluation fixups. 2016-10-14 00:03:12 +02:00
Michael Raskin 80ca889586 xscreensaver: 5.35 -> 5.36 2016-10-12 15:29:25 +02:00