Jonathan Ringer
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
Robert Schütz
da5310f82e
retroarchBare: use ffmpeg instead of ffmpeg_3 ( #123514 )
2021-05-19 21:57:35 +02:00
Jonathan Ringer
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
Jörg Thalheim
f4e14c1796
Merge pull request #123508 from stephank/fix-spacenavd-darwin
...
spacenavd: fix darwin build
2021-05-19 06:55:44 +01:00
Stéphan Kochen
12103ae09f
t-rec: fix darwin build
2021-05-18 18:25:30 -07:00
Ryan Horiguchi
035434d8d5
vscode-extensions.hashicorp.terraform: 2.10.2 -> 2.11.0
2021-05-18 17:55:48 -07:00
github-actions[bot]
7000ae2b9a
Merge master into staging-next
2021-05-19 00:55:36 +00:00
Anderson Torres
7a674b03b4
Merge pull request #123540 from stephank/fix-yapesdl-darwin
...
yapesdl: fix darwin build
2021-05-18 17:35:28 -03:00
Matthieu Coudron
ab205c5de1
vimPlugins: restore aliases
2021-05-18 22:15:58 +02:00
Stéphan Kochen
47a1b5e57f
yapesdl: fix darwin build
2021-05-18 18:39:15 +02:00
Jonathan Ringer
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
Stéphan Kochen
70e199136e
spacenavd: fix darwin build
2021-05-18 14:08:03 +02:00
Iosmanthus Teng
4927716658
vscode-extensions: remote-ssh acquires user's home directory from $HOME ( #122595 )
2021-05-18 03:06:56 +02:00
Sandro
f85bc843c2
Merge pull request #122759 from dotlambda/mono6
2021-05-18 01:25:35 +02:00
Sandro
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
Sandro
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
Florian Beeres
873f2632e2
vimPlugins.sad: init at 2019-02-18
2021-05-17 14:50:27 +02:00
Florian Beeres
add85d7ee7
vimPlugin: update
2021-05-17 14:50:15 +02:00
github-actions[bot]
3ff6965554
Merge master into staging-next
2021-05-17 06:22:23 +00:00
Ben Siraphob
c5a669d3f7
treewide: remove unzip where not needed
2021-05-16 19:29:28 -07:00
Devin Singh
79d252d26c
vimPlugins.edge: init at 2021-05-08
2021-05-16 18:35:37 -07:00
Devin Singh
644fbb4b8c
vimPlugins.vim-easyescape: init at 2020-11-22
2021-05-16 18:35:37 -07:00
Jonathan Ringer
d8e62d8e41
Merge remote-tracking branch 'origin/master' into staging-next
...
Fix cargo-flash build
2021-05-16 18:27:14 -07:00
Sandro
700942d2a5
Merge pull request #121119 from SuperSandro2000/remove-gnidorah
...
treewide: remove gnidorah
2021-05-17 02:42:24 +02:00
Martin Weinelt
7bd65d54f7
treewide: remove nand0p as maintainer
...
While looking at the sphinx package I noticed it was heavily
undermaintained, which is when we noticed nand0p has been inactive for
roughly 18 months. It is therefore prudent to assume they will not be
maintaining their packages, modules and tests.
- Their last contribution to nixpkgs was in 2019/12
- On 2021/05/08 I wrote them an email to the address listed in the
maintainer-list, which they didn't reply to.
2021-05-17 01:50:49 +02:00
"Matthieu Coudron"
f269c57097
vimPlugins: update
2021-05-17 00:48:52 +02:00
Matthieu Coudron
8c63ac7893
vimPlugins: generate an overlay
...
let update.py generates generated.nix as an overlay.
This should help maintaining vim-plugins outside of nixpkgs, as one can
use update.py to generate an out-of-tree vimPlugins overlay.
2021-05-17 00:40:25 +02:00
Andrey Kuznetsov
b012981301
vimPlugins.todo-comments-nvim: init at 2021-05-16
2021-05-16 14:50:57 -07:00
Andrey Kuznetsov
64bb7a00ba
vimPlugins: update
2021-05-16 14:50:57 -07:00
figsoda
a58b32743b
vimPlugins.indent-blankline-nvim-lua: init at 2021-04-28
2021-05-16 14:44:15 -07:00
github-actions[bot]
6cdac75d25
Merge staging-next into staging
2021-05-16 18:32:44 +00:00
github-actions[bot]
8c6d819143
Merge master into staging-next
2021-05-16 18:32:41 +00:00
figsoda
da04ea775e
vimPlugins.lsp_signature-nvim: init at 2021-05-07
2021-05-16 11:16:37 -07:00
Anderson Torres
cf45c45605
Merge pull request #121588 from eduardosm/sip-rename
...
pythonPackages.sip: rename to sip_4, pythonPackages.sip_5: rename to sip
2021-05-16 13:31:55 -03:00
Jan Tojnar
684991c696
Merge branch 'master' into staging-next
...
- Thunderbird 68 has been dropped on master.
- gccCrossLibcStdenv has been factored out on staging-next in all-packages.nix, while the file has been re-formatted on master.
2021-05-16 15:34:51 +02:00
Guillaume Girol
f1852527a9
Merge pull request #122915 from polygon/caprice32
...
caprice32: Add <string> include
2021-05-16 08:54:22 +00:00
github-actions[bot]
9911b1c75b
Merge staging-next into staging
2021-05-16 01:01:01 +00:00
github-actions[bot]
b484cef365
Merge master into staging-next
2021-05-16 01:00:58 +00:00
Sandro
f9a4fcd44c
Merge pull request #122988 from dbirks/vscode-tmux-keybinding-init
...
vscode-extensions.stephlin.vscode-tmux-keybinding: init at 0.0.6
2021-05-15 21:34:27 +02:00
github-actions[bot]
c10600230e
Merge staging-next into staging
2021-05-15 18:30:31 +00:00
github-actions[bot]
f1b78f8618
Merge master into staging-next
2021-05-15 18:30:28 +00:00
V
351171f677
vsce/MS-vsliveshare.vsliveshare: add V to maintainers
2021-05-15 14:42:40 +02:00
github-actions[bot]
49ec716c04
Merge staging-next into staging
2021-05-15 12:25:36 +00:00
github-actions[bot]
ec10b0958d
Merge master into staging-next
2021-05-15 12:25:33 +00:00
Devin Singh
5d176f3c20
vimPlugins.vim-clap: fix hash
2021-05-15 14:16:19 +02:00
Devin Singh
18355b4748
trouble.nvim: lsp-trouble.nvim -> trouble.nvim
2021-05-15 14:16:19 +02:00
Sergei Dolgov
5153e0e491
hplipWithPlugin: correct arch name for the plugin file on aarch64
...
Without this change, building hplipWithPlugin on aarch64 fails with:
cp: cannot stat 'lj-aarch64.so': No such file or directory
builder for '/nix/store/p0x02ppv0n1xj46wvik3p3cn4jikmr1q-hplip-3.20.11.drv' failed with exit code 1
This is because the corresponding file in the archive is actually called
lj-arm64.so.
hplipPlatforms exists to convert between the different names; this
commit only changes the value to a correct one.
2021-05-15 12:21:43 +02:00
github-actions[bot]
78ae7ac75e
Merge staging-next into staging
2021-05-15 06:22:25 +00:00
Vladimír Čunát
c48eaa70e3
Merge branch 'master' into staging-next
2021-05-14 22:27:34 +02:00
Eduardo Sánchez Muñoz
96002e32bf
ruffle: nightly-2021-04-02 -> nightly-2021-05-14
2021-05-14 12:44:38 +02:00
