Commit Graph

3428 Commits

Author SHA1 Message Date
Jan Tojnar
b8b9f52393 Merge branch 'master' into staging-next
Conflicts:
- pkgs/applications/networking/browsers/firefox/common.nix between 318fae87c0 and f6c5761935.
2022-05-21 17:52:39 +02:00
Michele Guerini Rocco
7ce1c5eed3
Merge pull request #173676 from risicle/ris-mkvtoolnix-darwin-cppfs-experimental
mkvtoolnix: remove outdated clang fix
2022-05-21 10:14:48 +02:00
Robert Scott
5d26153324 mkvtoolnix: remove outdated clang fix 2022-05-20 22:39:42 +01:00
github-actions[bot]
77bded3c43
Merge master into staging-next 2022-05-20 18:02:18 +00:00
Robert Schütz
d5a2974e52 libsForQt5.mauiPackages: init at 2.1.2 2022-05-20 08:54:02 -07:00
github-actions[bot]
17dfec3606
Merge master into staging-next 2022-05-19 00:02:14 +00:00
Artturi
b0c602515d
Merge pull request #173084 from Artturin/unecessaryprf
treewide: remove unecessary XDG_DATA_DIRS from appimage wrapType2
2022-05-18 21:23:58 +03:00
github-actions[bot]
e87bfef273
Merge staging-next into staging 2022-05-16 18:11:41 +00:00
github-actions[bot]
115f2f7878
Merge master into staging-next 2022-05-16 18:05:56 +00:00
Artturi
6323f3ccba
Merge pull request #173275 from zendo/test
mpc-qt: 2019-06-09 -> 22.02
2022-05-16 20:59:52 +03:00
zendo
d1e5ca2014 mpc-qt: 2019-06-09 -> 22.02 2022-05-16 23:11:26 +08:00
github-actions[bot]
add75748e2
Merge staging-next into staging 2022-05-16 12:03:45 +00:00
github-actions[bot]
f10256fb7a
Merge master into staging-next 2022-05-16 12:02:51 +00:00
github-actions[bot]
f74178b418
Merge staging-next into staging 2022-05-15 18:01:53 +00:00
Peter Jones
1ed0bc2be3
makemkv: install mmccextr
Some discs cause makemkv to attempt to execute `bin/mmccextr`.  Ensure
the file is installed so no run time errors occur.
2022-05-15 10:52:03 -07:00
Vladimír Čunát
d72c6a72d0
Merge branch 'master' into staging-next 2022-05-15 18:17:05 +02:00
Thiago Kenji Okada
acdec6d298
Merge pull request #172912 from armeenm/bump-byzanz
byzanz: 0.2.3.alpha -> unstable-2016-03-12
2022-05-15 12:53:44 +01:00
Jan Tojnar
d1b77f990f Merge branch 'staging-next' into staging
Conflicts:
	pkgs/applications/networking/browsers/firefox/common.nix between f6c5761935 and a373324120.
2022-05-15 07:08:29 +02:00
Artturin
1a634cc057 treewide: remove unecessary XDG_DATA_DIRS from appimage wrapType2
they're unnecessary since https://github.com/NixOS/nixpkgs/pull/161739/files

which links the schemas to their correct fhs locations and adds
gsettings-desktop-schemas and hicolor-icon-theme to appimage fhs
2022-05-15 05:19:23 +03:00
github-actions[bot]
dae6d3bb73
Merge master into staging-next 2022-05-14 12:01:17 +00:00
Jörg Thalheim
d8a708d2b6
Merge pull request #172801 from midchildan/fix/epgstation
epgstation: fix build
2022-05-14 08:12:55 +01:00
midchildan
6a0c84d594
epgstation: keep old buildInputs in overrideAttrs 2022-05-14 15:24:01 +09:00
Armeen Mahdian
51536724da byzanz: 0.2.3.alpha -> unstable-2016-03-12 2022-05-13 16:06:17 -05:00
midchildan
834477e4d4
epgstation: move node-pre-gyp and node-gyp-build to buildInputs 2022-05-14 00:48:28 +09:00
github-actions[bot]
814126147f
Merge staging-next into staging 2022-05-13 12:02:03 +00:00
github-actions[bot]
477cc9463d
Merge master into staging-next 2022-05-13 12:01:27 +00:00
Janne Heß
0027518c91
Merge pull request #172771 from wkral/ogmtools-fix
ogmtools: fix build
2022-05-13 11:57:33 +02:00
midchildan
dfeb273bfa
epgstation: fix build 2022-05-13 10:39:02 +09:00
github-actions[bot]
d79af4efe4
Merge staging-next into staging 2022-05-13 00:03:35 +00:00
github-actions[bot]
97ea1401a7
Merge master into staging-next 2022-05-13 00:03:00 +00:00
William Kral
f7958990af ogmtools: fix build 2022-05-12 14:54:38 -07:00
Thiago Kenji Okada
eae1669de5
Merge pull request #171836 from ncfavier/escape-wrapper-args
Fix wrapper arguments escaping
2022-05-12 21:55:06 +01:00
Naïm Favier
2ae69114a1
makeWrapper: implement --inherit-argv0
For symmetry/interoperability with makeBinaryWrapper. Implemented as
--argv0 '$0'
2022-05-10 22:07:57 +02:00
github-actions[bot]
3a79190750
Merge staging-next into staging 2022-05-10 18:01:50 +00:00
Sandro
4010722a05
Merge pull request #154131 from onny/vvave
vvave: init at 2.1.1
2022-05-10 15:37:53 +02:00
github-actions[bot]
1a3de31faa
Merge staging-next into staging 2022-05-10 12:11:45 +00:00
Jonas Heinrich
83b7231f6a clip: init at 2.1.1 2022-05-10 04:33:35 -04:00
github-actions[bot]
2bf60ff84f
Merge staging-next into staging 2022-05-10 06:01:44 +00:00
Artturin
c07b5cd424 mplayer: remove useless nulls 2022-05-10 00:58:50 +03:00
Jonas Heinrich
a0e539ac40 vvave: init at 2.1.1 2022-05-09 16:17:14 +02:00
Sandro
7169abf52f
python310Packages.babel: 2.9.1 -> 2.10.1 (#171867) 2022-05-09 01:53:28 +02:00
Marek Fajkus
ce00fa7b97
Merge pull request #170449 from lilyinstarlight/obs-gstreamer-0.3.3
obs-studio-plugins.obs-gstreamer: 0.2.1 -> 0.3.3
2022-05-08 00:44:30 +02:00
Aaron Andersen
8100bbdb41
Merge pull request #171096 from r-ryantm/auto-update/kodiPackages.inputstreamhelper
kodiPackages.inputstreamhelper: 0.5.8+matrix.1 -> 0.5.10+matrix.1
2022-05-07 03:14:28 -04:00
R. Ryantm
18c3377993 ffmpeg-normalize: 1.22.10 -> 1.23.0 2022-05-07 02:16:11 +00:00
Naïm Favier
0b94145288
vdr: fix wrapper arguments escaping 2022-05-06 18:30:18 +02:00
Pavol Rusnak
cfc3c4efcc
Merge pull request #170362 from r-ryantm/auto-update/ffmpeg-normalize
ffmpeg-normalize: 1.22.9 -> 1.22.10
2022-05-06 13:32:47 +02:00
Will Dietz
37cada5b61 vlc: 3.0.17 -> 3.0.17.3
https://code.videolan.org/videolan/vlc/-/tags/3.0.17.3
https://code.videolan.org/videolan/vlc/-/tags/3.0.17.2
https://code.videolan.org/videolan/vlc/-/tags/3.0.17.1

There's a 3.0.17.4, but is not listed as latest on videolan.org yet,
and is a hotfix for Windows, so stick with 3.0.17.3 for now.
2022-05-03 08:10:23 -05:00
Sandro
70c293cf81
Merge pull request #169931 from ck3d/vdr-fritz-1.5.4
vdrPlugins.fritzbox: 1.5.3 -> 1.5.4
2022-05-03 09:38:04 +02:00
Vladimír Čunát
9478ec747c
Merge branch 'staging-next-2022-04-23'
Close #169965: the PR and real 'staging-next' branch contained
extra systemd rebuild that I wanted to avoid in this iteration.
(to save Hydra's work)
2022-05-02 09:12:51 +02:00
rnhmjoj
8379a22914
mkvtoolnix: 66.0.0 -> 67.0.0 2022-05-01 17:09:25 +02:00