b682bf2892
Update pkgs/misc/emulators/ppsspp/default.nix
...
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
(cherry picked from commit 89cbb28f64b3406164e61cd1fcd7504a89b6e8fd)
2021-06-16 18:50:00 +00:00
70bbb7063c
ppsspp: fix build against ffmpeg 4.4
...
(cherry picked from commit babd906230da851b27fb66f18b90a2beac4c7ddd)
2021-06-16 18:50:00 +00:00
3fb4c3765f
mfc9140cdncupswrapper: init at 1.1.4-0
...
(cherry picked from commit 76f168a4f1005c3b0afb99a511b808f56e68db54)
2021-06-15 22:45:28 +00:00
a7797852a3
mfc9140cdnlpr: init at 1.1.2-1
...
(cherry picked from commit f52c8862c9b1fc524bd1401185944de6274db43b)
2021-06-15 22:45:28 +00:00
6eba052712
Merge pull request #124275 from lunik1/libretro-ppsspp-ffmpeg4-backport
...
[21.05] libretro.ppsspp: backport update and fix build against ffmpeg 4.4
2021-05-29 12:48:36 +02:00
47c51cc3bf
lightspark: ffmpeg_3 -> ffmpeg
...
(cherry picked from commit 24129003fd275afb3ea7c26feaf7d6d374327e39)
2021-05-27 14:42:25 -07:00
e3f7168d86
libretro.ppsspp: update to v1.11 and fix build againt ffmpeg 4.4
...
(cherry picked from commit a5a5088eae8955bc781f240af54880fa78232a2f)
2021-05-25 16:49:02 +01:00
11a9ac00fc
Merge remote-tracking branch 'origin/master' into staging-next
...
Conflicts:
pkgs/tools/networking/xh/default.nix
2021-05-22 18:19:10 -07:00
5cf7cfccf0
Merge pull request #123624 from ben0x539/wtf
2021-05-22 17:42:46 +02:00
6187a1f53b
Update pkgs/misc/vim-plugins/generated.nix
2021-05-22 16:31:05 +02:00
563389a7fd
Merge master into staging-next
2021-05-22 12:27:09 +00:00
1941e7c996
vimPlugins.conflict-marker-vim: init at 2020-09-23
2021-05-22 13:25:22 +01:00
fdaf66b6f0
vimPlugins.hiPairs: init at 2020-12-10
2021-05-22 13:25:21 +01:00
9b0fca29f9
vimPlugins.nvim-treesitter-pyfold: init at 2021-05-20
2021-05-22 13:25:21 +01:00
8c2a60ad5a
vimPlugins.pears-nvim: init at 2021-05-21
2021-05-22 13:25:21 +01:00
0eb12af279
vimPlugins.nvim-dap-ui: init at 2021-05-21
2021-05-22 13:25:21 +01:00
757de5a432
vimPlugins.scrollbar-nvim: init at 2020-09-28
2021-05-22 13:25:21 +01:00
dcc83cd07a
vimPlugins.telescope-dap-nvim: init at 2021-03-26
2021-05-22 13:25:20 +01:00
e54c43f8f1
vimPlugins: update
2021-05-22 13:25:20 +01:00
c66caa6a90
spaacenavd: config file in $XDG_CONFIG_HOME
2021-05-22 12:48:57 +02:00
dfb36eed76
spacenavd: pidfile in $XDG_RUNTIME_DIR
2021-05-22 12:48:38 +02:00
be01cb8b97
nixos/spacenavd: run as user service
2021-05-22 12:48:12 +02:00
7507aed4e1
Merge remote-tracking branch 'origin/master' into staging-next
...
Conflicts:
pkgs/development/tools/rust/cargo-expand/default.nix
pkgs/tools/misc/blflash/default.nix
2021-05-21 19:49:05 -07:00
1c4571cf46
vimPlugins.bracey-vim: init at 2021-05-11
2021-05-21 19:08:38 -07:00
07ae0b47e3
vimPlugins: update
2021-05-21 19:08:38 -07:00
901fb5e64e
Merge master into staging-next
2021-05-22 00:56:03 +00:00
3ff0ef5666
Merge pull request #121809 from rvolosatovs/init/stt
...
Deprecate deepspeech in favor of stt
2021-05-21 23:19:29 +02:00
12a9bd6fb8
Merge pull request #123457 from jack-michaud/betterlockscreen-3.1.0
...
betterlockscreen: 3.0.1 -> 3.1.0
2021-05-21 23:03:04 +02:00
5efa447c88
Merge master into staging-next
2021-05-21 18:39:29 +00:00
2a215dc423
vimPlugins.vim-wordmotion: init at 2021-04-25
2021-05-21 18:30:32 +02:00
9e6d402e46
vimPlugins: update
2021-05-21 18:30:10 +02:00
14f3686af1
Merge remote-tracking branch 'origin/master' into staging-next
...
Conflicts:
pkgs/applications/terminal-emulators/alacritty/default.nix
pkgs/servers/clickhouse/default.nix
2021-05-20 09:12:42 -07:00
33b0e0d792
deepspeech: rename to stt
2021-05-20 17:52:52 +02:00
da5310f82e
retroarchBare: use ffmpeg instead of ffmpeg_3 ( #123514 )
2021-05-19 21:57:35 +02:00
c1f8a15dac
Merge remote-tracking branch 'origin/master' into staging-next
...
Conflicts:
nixos/doc/manual/release-notes/rl-2105.xml
pkgs/tools/security/sequoia/default.nix
2021-05-19 10:39:54 -07:00
f4e14c1796
Merge pull request #123508 from stephank/fix-spacenavd-darwin
...
spacenavd: fix darwin build
2021-05-19 06:55:44 +01:00
76a63de3dc
kodi-retroarch-advanced-launchers: take `lib` arg
...
This package was changed to refer to `lib` instead of `stdenv.lib`, but
`lib` was not actually in scope. I don't know what this package is about
or how evaluation got to that point, but this is clearly more correct.
2021-05-18 21:15:08 -07:00
12103ae09f
t-rec: fix darwin build
2021-05-18 18:25:30 -07:00
035434d8d5
vscode-extensions.hashicorp.terraform: 2.10.2 -> 2.11.0
2021-05-18 17:55:48 -07:00
7000ae2b9a
Merge master into staging-next
2021-05-19 00:55:36 +00:00
7a674b03b4
Merge pull request #123540 from stephank/fix-yapesdl-darwin
...
yapesdl: fix darwin build
2021-05-18 17:35:28 -03:00
ab205c5de1
vimPlugins: restore aliases
2021-05-18 22:15:58 +02:00
47a1b5e57f
yapesdl: fix darwin build
2021-05-18 18:39:15 +02:00
f7a112f6c4
Merge remote-tracking branch 'origin/master' into staging-next
...
Conflicts:
pkgs/applications/graphics/emulsion/default.nix
pkgs/development/tools/misc/texlab/default.nix
pkgs/development/tools/rust/bindgen/default.nix
pkgs/development/tools/rust/cargo-udeps/default.nix
pkgs/misc/emulators/ruffle/default.nix
pkgs/tools/misc/code-minimap/default.nix
2021-05-18 08:57:16 -07:00
70e199136e
spacenavd: fix darwin build
2021-05-18 14:08:03 +02:00
d1a2274f68
betterlockscreen: 3.0.1 -> 3.1.0
...
Updates to latest version that has some bugfixes.
https://github.com/pavanjadhaw/betterlockscreen/compare/3.0.1...3.1.0
2021-05-17 22:59:41 -07:00
4927716658
vscode-extensions: remote-ssh acquires user's home directory from `$HOME` ( #122595 )
2021-05-18 03:06:56 +02:00
f85bc843c2
Merge pull request #122759 from dotlambda/mono6
2021-05-18 01:25:35 +02:00
11d75bc234
Merge pull request #123086 from mebubo/hplipWithPlugin
...
hplipWithPlugin: correct arch name for the plugin file on aarch64
2021-05-17 19:30:03 +02:00
530c9fcbc7
Merge pull request #122975 from eduardosm/ruffle
...
ruffle: nightly-2021-04-02 -> nightly-2021-05-14
2021-05-17 19:03:09 +02:00
lunik1
lunik1
Martin Weinelt
Robert Schütz
John Chadwick
Jonathan Ringer
Sandro
github-actions[bot]
Ronan Mac Fhlannchadha
sohalt
notusknot
davidak
Maximilian Bosch
"Lorenzo Manacorda"
Roman Volosatovs
Jörg Thalheim
Benjamin Herr
Stéphan Kochen
Ryan Horiguchi
Anderson Torres
Matthieu Coudron
Jack Michaud
Iosmanthus Teng