Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pull] master from NixOS:master #130

Merged
merged 146 commits into from
Jan 2, 2024
Merged
Changes from 3 commits
Commits
Show all changes
146 commits
Select commit Hold shift + click to select a range
5d2035a
haskellPackages: stackage LTS 21.21 -> LTS 21.23
ncfavier Dec 4, 2023
a87e99f
all-cabal-hashes: 2023-11-20T05:37:18Z -> 2023-12-04T17:35:08Z
ncfavier Dec 4, 2023
1bd6371
haskellPackages: regenerate package set based on current config
ncfavier Dec 4, 2023
1a1a8d2
maintainers/scripts/merge-and-open-pr: fix error handling
ncfavier Dec 4, 2023
221b8aa
haskellPackages: fix eval
ncfavier Dec 4, 2023
a07e69c
Merge master into haskell-updates
github-actions[bot] Dec 5, 2023
13b1681
Merge remote-tracking branch 'origin/master' into haskell-updates
sternenseemann Dec 5, 2023
aa1ab6c
haskellPackages: fix eval some more
ncfavier Dec 5, 2023
88545ac
haskellPackages: regenerate package set based on current config
ncfavier Dec 5, 2023
d8a4ff6
Merge master into haskell-updates
github-actions[bot] Dec 6, 2023
9f9ad84
Merge master into haskell-updates
github-actions[bot] Dec 7, 2023
0ae1374
agdaPackages._1lab: unstable-2023-10-11 -> unstable-2023-12-04
ncfavier Dec 7, 2023
0a686c3
haskellPackages.hnix: remove obsolete patch and overrides
ncfavier Dec 7, 2023
31dffd8
Merge master into haskell-updates
github-actions[bot] Dec 8, 2023
dc3afe8
Merge master into haskell-updates
github-actions[bot] Dec 9, 2023
b11a691
haskell.packages.ghc810.http-types: disable checks
ncfavier Dec 9, 2023
4e4b31d
haskell.packages.ghc90.http-types: disable checks
ncfavier Dec 9, 2023
d3fcf59
haskellPackages.scat: unbreak
rnhmjoj Dec 9, 2023
cc3d0ae
Merge pull request #273211 from rnhmjoj/haskell-updates
ncfavier Dec 10, 2023
35e9f7d
Merge master into haskell-updates
github-actions[bot] Dec 10, 2023
67bb428
haskellPackages.selda: unbreak
rnhmjoj Dec 10, 2023
d65c444
Add hardware.sane.backends-package option.
nh2 Dec 10, 2023
515e192
Merge pull request #273249 from rnhmjoj/haskell-updates
ncfavier Dec 10, 2023
9fb12e8
Merge master into haskell-updates
github-actions[bot] Dec 11, 2023
dc0fd26
haskellPackages.hnix-store-core: move older to extraPackages
sorki Dec 11, 2023
a042857
haskellPackages.scat, haskellPackages.selda: drop hydraPlatforms = li…
sorki Dec 11, 2023
9d6713f
haskellPackages.cachix_1_3_3: remove
sorki Dec 11, 2023
0b8c1b3
Merge pull request #273490 from sorki/haskell-updates
ncfavier Dec 11, 2023
e1f9606
Merge master into haskell-updates
github-actions[bot] Dec 12, 2023
78018ef
cmus: fix feature detection on darwin
emilytrau Dec 2, 2023
66ea46b
haskellPackages.rapid: remove broken flag
eyeinsky Dec 12, 2023
38baa1f
agdaPackages.standard-library: 1.7.3 -> 2.0
ncfavier Dec 12, 2023
7ac0108
haskell.packages.ghc98.haskell-language-server: Enable job
maralorn Dec 12, 2023
54fc9f6
haskell.packages.ghc9{6,8}: work around aarch64-darwin output cycles
mpscholten Sep 30, 2023
2b224e8
Merge master into haskell-updates
github-actions[bot] Dec 13, 2023
f061cfd
Merge master into haskell-updates
github-actions[bot] Dec 14, 2023
43b6f6d
haskell.lib.compose.triggerRebuild: don't discard old postUnpack
sternenseemann Dec 14, 2023
7275840
haskellPackages.cachix: workaround cache corruption on aarch64-linux
sternenseemann Dec 14, 2023
2405ff3
Merge master into haskell-updates
github-actions[bot] Dec 15, 2023
7ee71fe
Merge master into haskell-updates
github-actions[bot] Dec 16, 2023
fccc614
Merge master into haskell-updates
github-actions[bot] Dec 17, 2023
83f5ace
Merge master into haskell-updates
github-actions[bot] Dec 18, 2023
69fbd8d
haskell.packages.ghc98: Add system-cxx-std-lib attribute to fix eval
maralorn Dec 18, 2023
3d56b81
Merge master into haskell-updates
github-actions[bot] Dec 19, 2023
07c3083
haskellPackages: update dhall and related packages
sorki Dec 19, 2023
233c67e
Merge pull request #275353 from sorki/haskell-updates
maralorn Dec 19, 2023
5a098d2
haskellPackages.hopengpg-tools: Unmark broken
motiejus Dec 18, 2023
3d3ba25
Merge pull request #275414 from motiejus/hopenpgp-tools-haskell-updates
maralorn Dec 19, 2023
0b34504
Merge master into haskell-updates
github-actions[bot] Dec 20, 2023
21acd3b
haskell.packages.*.{terminfo,xhtml}: allow builds on Hydra for cross
sternenseemann Dec 20, 2023
bd16733
release-haskell.nix: add missing ghc948 jobs
sternenseemann Dec 20, 2023
3d2fdba
pkgsCross.*.haskell.packages.ghc96.terminfo: fix evaluation
sternenseemann Dec 20, 2023
9067af4
haskell.compiler: drop all ghcs without an stackage LTS snapshot
sternenseemann Dec 20, 2023
7998143
haskell.compiler: also build manual for cross-compilers
sternenseemann Dec 20, 2023
4025dfd
Merge master into haskell-updates
github-actions[bot] Dec 21, 2023
d34c05a
Merge master into haskell-updates
github-actions[bot] Dec 22, 2023
a6e59ff
haskellPackages.warp: enable tests and fix eval error
rvl Dec 22, 2023
04a4f1f
git-annex: bump hash
maralorn Dec 22, 2023
8c8f4de
Merge pull request #276009 from rvl/haskell-updates-warp_3_3_31
maralorn Dec 22, 2023
3dbf058
Merge branch 'master' into haskell-updates
maralorn Dec 22, 2023
660a21d
Merge master into haskell-updates
github-actions[bot] Dec 23, 2023
5496357
stress-ng: 0.17.02 -> 0.17.03
r-ryantm Dec 23, 2023
4c395aa
agdaPackages.functional-linear-algebra: 0.4.1 -> 0.5.0
ncfavier Dec 23, 2023
9cced8e
Merge master into haskell-updates
github-actions[bot] Dec 24, 2023
26c2ed1
nixos/tailscale: fix after and wants
hellodword Dec 24, 2023
e7631ae
Merge master into haskell-updates
github-actions[bot] Dec 25, 2023
f2e94c2
valeronoi: 0.2.0 -> 0.2.1
r-ryantm Dec 25, 2023
fe1afe6
Merge master into haskell-updates
github-actions[bot] Dec 26, 2023
d4c7b50
Merge master into haskell-updates
github-actions[bot] Dec 27, 2023
5692c3b
agdaPackages.agda-categories: 0.1.7.2 -> 0.2.0
ncfavier Dec 27, 2023
9a00eb1
haskellPackages.gi-vte: fix by adding missing gi-cairo dep
cdepillabout Dec 27, 2023
b2e27ff
Merge pull request #277010 from cdepillabout/fix-gi-vte
cdepillabout Dec 27, 2023
ca89b11
agdaPackages.agdarsec: mark as broken
ncfavier Dec 27, 2023
f604139
Merge master into haskell-updates
github-actions[bot] Dec 28, 2023
6eaf979
Merge pull request #273765 from ncfavier/agda-stdlib
ncfavier Dec 28, 2023
03557b4
Merge master into haskell-updates
github-actions[bot] Dec 29, 2023
0929716
nixos/tor: fix transport plugin exe name
AtaraxiaSjel Dec 22, 2023
c4fe98a
Merge master into haskell-updates
github-actions[bot] Dec 30, 2023
bda241c
octodns: move pytestCheckHook to nativeCheckInputs
NickCao Dec 30, 2023
e8a4189
vivaldi: 6.5.3206.39 -> 6.5.3206.48
r-ryantm Dec 30, 2023
17d6576
tree-sitter-grammars: add bitbake
otavio Dec 30, 2023
50d354d
Merge master into haskell-updates
github-actions[bot] Dec 31, 2023
84ab567
ccache: 4.8.3 -> 4.9
r-ryantm Dec 31, 2023
b0291f7
audiobookshelf: 2.7.0 -> 2.7.1
adamcstephens Dec 31, 2023
9504795
Merge master into haskell-updates
github-actions[bot] Jan 1, 2024
7c70bf8
arping: 2.23 -> 2.24
r-ryantm Jan 1, 2024
b629581
release-haskell: Correctly disable hls jobs on ghc 8.10.7
maralorn Jan 1, 2024
9d21cb8
mainsail: 2.9.0 -> 2.9.1
r-ryantm Jan 1, 2024
9f37ee3
zigbee2mqtt: 1.34.0 -> 1.35.0
mweinelt Jan 1, 2024
258151d
haskellPackages.update-nix-fetchgit: Fix build
maralorn Jan 1, 2024
f963570
Merge branch 'master' into haskell-updates
maralorn Jan 1, 2024
91065f3
Merge pull request #275606 from sternenseemann/misc-release-haskell
maralorn Jan 1, 2024
0bd0847
Merge pull request #275616 from sternenseemann/ghc-cross-docs
maralorn Jan 1, 2024
a7baccf
Merge branch 'master' into haskell-updates
maralorn Jan 1, 2024
09f447a
Merge branch 'ghc-remove-without-lts' into haskell-updates
maralorn Jan 1, 2024
aa84d90
haskellPackages.compact: Unmark broken
maralorn Jan 1, 2024
309913c
templ: 0.2.476 -> 0.2.501
r-ryantm Jan 1, 2024
ca53b82
fzf-make: 0.13.0 -> 0.14.0
Sigmanificient Jan 1, 2024
119323d
Merge branch 'master' into haskell-updates
maralorn Jan 1, 2024
15257e4
haskellPackages: regenerate package set based on current config
maralorn Jan 1, 2024
823ca12
cockpit: 306 -> 307
lucasew Dec 31, 2023
2684e3e
haskellPackages: mark builds failing on hydra as broken
maralorn Jan 1, 2024
dffa76a
release-haskell.nix: Cleanup missing compiler names
maralorn Jan 1, 2024
7b4156e
haskellPackages: Fix eval errors
maralorn Jan 1, 2024
5518af0
haskellPackages: Fix eval errors
maralorn Jan 1, 2024
2ee82b8
licensure: init at 0.3.2
soispha Dec 23, 2023
38f9646
newsraft: refactor
Jan 1, 2024
4985198
the-way: 0.20.1 -> 0.20.2
r-ryantm Jan 1, 2024
9e33a4c
baboossh: 1.2.0 -> 1.2.1
fabaff Jan 1, 2024
c82f8a6
satty: add shell completions
donovanglover Dec 29, 2023
ccac72b
satty: add myself as maintainer
donovanglover Dec 29, 2023
4e025c4
Merge pull request #278006 from r-ryantm/auto-update/arping
sikmir Jan 1, 2024
fb5f998
Merge pull request #277867 from r-ryantm/auto-update/ccache
kira-bruneau Jan 1, 2024
5ff7811
makeInitrdNGTool: 0.1.0 -> 0.1.0
r-ryantm Jan 1, 2024
5269ed5
Merge pull request #277940 from lucasew/bump-cockpit-307
markuskowa Jan 1, 2024
9a15f0b
Merge pull request #277576 from donovanglover/satty
NickCao Jan 1, 2024
38034a8
Merge pull request #273286 from nh2/sane-backends-package-option
symphorien Jan 1, 2024
9769602
Merge pull request #278121 from fabaff/baboossh-bump
NickCao Jan 1, 2024
df4cf5d
Merge pull request #278119 from r-ryantm/auto-update/the-way
NickCao Jan 1, 2024
9cffe3e
Merge pull request #278116 from arthsmn/newsraft
NickCao Jan 1, 2024
942fdda
Merge pull request #278081 from r-ryantm/auto-update/templ
NickCao Jan 1, 2024
c653984
Merge pull request #277805 from r-ryantm/auto-update/vivaldi
NickCao Jan 1, 2024
30f4f52
Merge pull request #276580 from r-ryantm/auto-update/valeronoi
NickCao Jan 1, 2024
3d6243a
Merge pull request #276430 from hellodword/patch-1
NickCao Jan 1, 2024
4044ae3
Merge pull request #276313 from r-ryantm/auto-update/stress-ng
NickCao Jan 1, 2024
66ea36d
Merge pull request #276159 from AtaraxiaSjel/fix/tor-obfs4proxy
NickCao Jan 1, 2024
dd11ba6
Merge pull request #277809 from otavio/bb
thiagokokada Jan 1, 2024
58cbd01
Merge pull request #276339 from soispha/licensure
markuskowa Jan 1, 2024
86d4d1a
bambu-studio: add gst-plugins-good (#274383)
JeremiahSecrist Jan 1, 2024
36f775a
haskellPackages.postgrest: 10.1.1 -> 11.2.2 and fix build
SFrijters Dec 20, 2023
d9e1745
postgrest: add top-level package
SFrijters Dec 20, 2023
677d868
haskellPackages.postgrest: 11.2.2 -> 12.0.2
rvl Dec 23, 2023
111c8d7
haskellPackages.postgrest: Add more build-depends for 12.0.2
rvl Dec 23, 2023
69d698d
Merge pull request #278093 from Sigmanificient/update-fzf-make-0.14.0
figsoda Jan 1, 2024
3349a3d
Merge pull request #277978 from adamcstephens/abs/2.7.1
adamcstephens Jan 1, 2024
1570f54
Merge pull request #278128 from r-ryantm/auto-update/makeInitrdNGTool
ElvishJerricco Jan 1, 2024
f8fc00b
Merge pull request #275614 from SFrijters/haskell-packages-postgrest-…
maralorn Jan 1, 2024
2df2bdd
Merge pull request #278056 from r-ryantm/auto-update/mainsail
lovesegfault Jan 1, 2024
629cc49
Merge branch 'master' into haskell-updates
maralorn Jan 1, 2024
aeca390
Merge pull request #271584 from emilytrau/cmus-darwin
emilytrau Jan 1, 2024
eb6169a
Merge master into haskell-updates
github-actions[bot] Jan 2, 2024
de46920
Merge pull request #278059 from mweinelt/zigbee2mqtt-1.35.0
mweinelt Jan 2, 2024
c60ed18
terraform-providers.migadu: init at 2023.12.21
tautologicc Jan 2, 2024
18a01f3
haskellPackages: mark builds failing on hydra as broken
maralorn Jan 2, 2024
fa360ee
Merge pull request #272097 from NixOS/haskell-updates
maralorn Jan 2, 2024
63143ac
Merge pull request #277747 from NickCao/octodns
NickCao Jan 2, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion pkgs/applications/audio/cmus/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,17 @@ stdenv.mkDerivation rec {
patches = [
./option-debugging.patch
# ffmpeg 6 fix https://github.com/cmus/cmus/pull/1254/
(fetchpatch { url = "https://github.com/cmus/cmus/commit/07b368ff1500e1d2957cad61ced982fa10243fbc.patch"; hash = "sha256-5gsz3q8R9FPobHoLj8BQPsa9s4ULEA9w2VQR+gmpmgA="; })
(fetchpatch {
name = "ffmpeg-6-compat.patch";
url = "https://github.com/cmus/cmus/commit/07b368ff1500e1d2957cad61ced982fa10243fbc.patch";
hash = "sha256-5gsz3q8R9FPobHoLj8BQPsa9s4ULEA9w2VQR+gmpmgA=";
})
# function detection breaks with clang 16
(fetchpatch {
name = "clang-16-function-detection.patch";
url = "https://github.com/cmus/cmus/commit/4123b54bad3d8874205aad7f1885191c8e93343c.patch";
hash = "sha256-YKqroibgMZFxWQnbmLIHSHR5sMJduyEv6swnKZQ33Fg=";
})
];

nativeBuildInputs = [ pkg-config ];
Expand Down