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

2631 commits

Author SHA1 Message Date
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
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
Shea Levy 6c4ac28b6f
riscv-pk: Properly respect --prefix. 2018-02-20 10:29:43 -05:00
adisbladis e4fb79971c
Merge pull request #35165 from pjan/vim-rooter
Adds vim-rooter plugin
2018-02-20 16:58:09 +08:00
Shea Levy fd2f2bbe6f
riscv-pk: Add a variant with a kernel 2018-02-19 12:37:46 -05:00
pjan vandaele 92b6275773
Adds vim-rooter plugin 2018-02-19 12:09:17 +09:00
Shea Levy 29013598a7
Fix typo 2018-02-18 19:28:23 -05:00
Shea Levy 7f3c97ae9e
riscv-pk: Init at 01.pre438_e5846a2. 2018-02-18 18:11:03 -05:00
xeji 6e9bc081b1 mfcl2720dwcupswrapper: init at 3.2.0-1
Brother MFC-L2720DW CUPS wrapper driver
2018-02-18 19:47:05 +01:00
xeji 380d759659 mfcl2720dwlpr: init at 3.2.0-1
Brother MFC-L2720DW lpr driver
2018-02-18 19:37:19 +01:00
Ambroz Bizjak 965ddac92f cups: Add patch for bug where CUPS fails to save files to disk
Upstream report: https://github.com/apple/cups/issues/5118

In addition to not saving files, this results in spam messages in the log once per second (Expiring subscriptions...)
which is what led me to discover this bug. The patch was made by hand because the patch from the commit does not apply.
2018-02-18 14:46:01 +01:00
Jan Malakhovski 2f4eb68241 libpressureaudio: init at apulse.version 2018-02-17 17:51:07 +00:00
Jan Malakhovski 771d635f0e apulse: 0.1.10 -> 0.1.11 2018-02-17 16:02:53 +00:00
André-Patrick Bubel 3a27c298f2
cups-kyocera: Fix spelling mistake in comment 2018-02-16 21:44:42 +01:00
Sam Parkinson 64573492e2 vim-pencil: init at 2017-06-14 2018-02-12 22:33:41 +01:00
Jörg Thalheim cbd14de2c0
Merge branch 'master' into add_vim_plugins 2018-02-10 12:38:56 +00:00
Jörg Thalheim 2bffc88a51
Merge pull request #34631 from symphorien/targets-vim
vimPlugins.targets-vim: init at 2017-12-03
2018-02-10 00:52:17 +00:00
Jörg Thalheim dad8a01530
Merge pull request #34739 from ryantm/ataripp
ataripp: 1.73 -> 1.81
2018-02-09 08:27:38 +00:00
Ryan Mulligan 64fbc476b7 ataripp: 1.73 -> 1.81
fixes #34725
2018-02-08 07:43:34 -08:00
Maximilian Bosch 8e70725077
vim_configurable: enable overrides
Sometimes it's needed to override parts of `vim_configurable`, for
instance when using ENSIME (http://ensime.github.io/), in this case you
need a Python interpreter and the modules `sexpdata` and
`websocket_client`.

However overriding `vim_configurable` is quite hard as we run
`vimUtils.makeCustomizable` over the default comming from
`configurable.nix`. Therefore it's necessary to copy the code from
`all-packages.nix` and alter the parts you need: https://nixos.org/nix-dev/2017-April/023364.html

In order to simplify overriding `vim_configurable` I added an
`override` and an `overrideAttrs` function to `vimutils.makeCustomizable`
to ensure that the customization capabilities won't be lost after
altering the derivation.

Now it's possible to write expressions like this without evaluation
failures:

```
with pkgs;

let
  vimPy3 = vim_configurable.override {
    python = python3;
  };
in vimPy3.customize { ... }
```
2018-02-07 16:57:40 +01:00
Symphorien Gibol 9d5cce6767 vimPlugins.targets-vim: init at 2017-12-03 2018-02-05 18:35:16 +01:00
José Romildo Malaquias 7bf36a8a9a greybird: 3.22.5 -> 3.22.6 2018-02-04 09:08:17 -02:00