2023-06-26 10:12:00 +00:00
{ fetchpatch2 , fetchurl }:
2023-05-10 22:36:27 +00:00
let
2023-05-10 22:51:34 +00:00
fetchpatch' = {
saneCommit ? null ,
prUrl ? null ,
2023-05-24 23:08:12 +00:00
hash ? null ,
title ? null ,
2023-05-10 22:51:34 +00:00
} :
let
url = if prUrl != null then
# prUrl takes precedence over any specific commit
" ${ prUrl } . d i f f "
else
" h t t p s : / / g i t . u n i n s a n e . o r g / c o l i n / n i x p k g s / c o m m i t / ${ saneCommit } . d i f f "
;
2023-06-26 10:12:00 +00:00
in fetchpatch2 (
2023-05-24 23:08:12 +00:00
{ inherit url ; }
// ( if hash != null then { inherit hash ; } else { } )
// ( if title != null then { name = title ; } else { } )
) ;
2023-05-10 22:36:27 +00:00
in [
2022-10-25 13:31:18 +00:00
2023-06-25 01:17:14 +00:00
# (fetchpatch' {
# # XXX: doesn't cleanly apply; fetch `firefox-pmos-mobile` branch from my git instead
# title = "firefox-pmos-mobile: init at -pmos-2.2.0";
# prUrl = "https://github.com/NixOS/nixpkgs/pull/121356";
# hash = "sha256-eDsR1cJC/IMmhJl5wERpTB1VGawcnMw/gck9sI64GtQ=";
# })
2023-06-26 10:09:32 +00:00
# (fetchpatch' {
# saneCommit = "70c12451b783d6310ab90229728d63e8a903c8cb";
# title = "firefox-pmos-mobile: init at -pmos-2.2.0";
2023-06-27 01:59:49 +00:00
# hash = "sha256-mA22g3ZIERVctq8Uk5nuEsS1JprxA+3DvukJMDTOyso=";
2023-06-26 10:09:32 +00:00
# })
# (fetchpatch' {
# saneCommit = "ee19a28aa188bb87df836a4edc7b73355b8766eb";
# title = "firefox-pmos-mobile: format the generated policies.nix file";
# hash = "sha256-K8b3QpyVEjajilB5w4F1UHGDRGlmN7i66lP7SwLZpWI=";
# })
# (fetchpatch' {
# saneCommit = "c068439c701c160ba15b6ed5abe9cf09b159d584";
# title = "firefox-pmos-mobile: implement an updateScript";
# hash = "sha256-afiGDHbZIVR3kJuWABox2dakyiRb/8EgDr39esqwcEk=";
# })
# (fetchpatch' {
# saneCommit = "865c9849a9f7bd048e066c2efd8068ecddd48e33";
# title = "firefox-pmos-mobile: 2.2.0 -> 4.0.2";
# hash = "sha256-WjWSW0qE+cypvUkDRfK7d9Te8m5zQXwF33z8nEhbvrE=";
# })
# (fetchpatch' {
# saneCommit = "eb6aae632c55ce7b0a76bca549c09da5e1f7761b";
# title = "firefox-pmos-mobile: refactor and populate `passthru` to aid external consumers";
# hash = "sha256-/LhbwXjC8vuKzIuGQ3/FGplbLllsz57nR5y+PeDjGuA=";
# })
# (fetchpatch' {
# saneCommit = "c9b90ef1e17ea21ac779a86994e5d9079a2057b9";
# title = "librewolf-pmos-mobile: init";
# hash = "sha256-oQEM3EZfAOmfZzDu9faCqyOFZsdHYGn1mVBgkxt68Zg=";
# })
2023-06-25 18:05:06 +00:00
( fetchpatch' {
2023-06-26 10:09:32 +00:00
saneCommit = " c 3 b e c d 7 c d f 1 4 4 d 8 5 d 1 2 e 2 e 7 6 6 6 3 e 9 5 4 9 a 0 5 3 6 e f d " ;
title = " f i r e f o x - p m o s - m o b i l e : i n i t a t 4 . 0 . 2 " ;
hash = " s h a 2 5 6 - N R h 2 I N U M A 2 K 7 q 8 z i o q K A 7 x w o q g 7 v 6 s x p u J R p T G 5 I P 1 Q = " ;
2023-06-25 18:05:06 +00:00
} )
2023-01-21 04:48:57 +00:00
# splatmoji: init at 1.2.0
2023-05-10 22:51:34 +00:00
( fetchpatch' {
saneCommit = " 7 5 1 4 9 0 3 9 b 6 e a f 5 7 d 8 a 9 2 1 6 4 e 9 0 a a b 2 0 e b 5 d 8 9 1 9 6 " ;
prUrl = " h t t p s : / / g i t h u b . c o m / N i x O S / n i x p k g s / p u l l / 2 1 1 8 7 4 " ;
2023-07-05 09:03:25 +00:00
hash = " s h a 2 5 6 - j D X Y L l X a E B K M r Z 2 d g x c 6 u c r c X / 5 d t q o I I K w + A y 1 9 v l c = " ;
2023-01-21 04:48:57 +00:00
} )
2023-02-14 10:19:32 +00:00
# (fetchpatch {
# # stdenv: fix cc for pseudo-crosscompilation
# # closed because it breaks pkgsStatic (as of 2023/02/12)
# url = "https://github.com/NixOS/nixpkgs/pull/196497.diff";
# hash = "sha256-eTwEbVULYjmOW7zUFcTUqvBZqUFjHTKFhvmU2m3XQeo=";
# })
2023-07-25 12:38:19 +00:00
# ./2022-12-19-i2p-aarch64.patch
2022-12-20 03:10:05 +00:00
2023-01-31 05:17:34 +00:00
# fix for CMA memory leak in mesa: <https://gitlab.freedesktop.org/mesa/mesa/-/issues/8198>
2023-03-03 13:40:48 +00:00
# fixed in mesa 22.3.6: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21330/diffs>
2023-01-31 05:17:34 +00:00
# only necessary on aarch64.
# it's a revert of nixpkgs commit dcf630c172df2a9ecaa47c77f868211e61ae8e52
2023-03-06 11:36:00 +00:00
# ./2023-01-30-mesa-cma-leak.patch
# upgrade to 22.3.6 instead
2023-03-28 06:03:20 +00:00
# ./2023-02-28-mesa-22.3.6.patch
2023-01-31 05:17:34 +00:00
2023-03-04 22:26:09 +00:00
# fix qt6.qtbase and qt6.qtModule to cross-compile.
# unfortunately there's some tangle that makes that difficult to do via the normal `override` facilities
./2023-03-03-qtbase-cross-compile.patch
2023-03-05 06:30:29 +00:00
# let ccache cross-compile
2023-03-28 06:03:20 +00:00
# TODO: why doesn't this apply?
# ./2023-03-04-ccache-cross-fix.patch
2023-03-10 05:19:21 +00:00
2023-06-08 22:48:57 +00:00
# 2023-04-11: bambu-studio: init at 01.06.02.04
2023-05-10 22:51:34 +00:00
( fetchpatch' {
prUrl = " h t t p s : / / g i t h u b . c o m / N i x O S / n i x p k g s / p u l l / 2 0 6 4 9 5 " ;
2023-07-05 09:03:25 +00:00
hash = " s h a 2 5 6 - X G 4 h v H X m P / w g i K u N R C A f t t a G L r g / 6 m A O r + Y v A V m y c K Q = " ;
2023-04-12 02:44:37 +00:00
} )
2023-05-15 22:08:09 +00:00
# (fetchpatch' {
# # phoc: 0.25.0 -> 0.27.0
# # TODO: move wayland-scanner & glib to nativeBuildInputs
# # TODO: once i press power button to screen blank, power doesn't reactivate phoc
2023-05-15 23:30:29 +00:00
# # sus commits:
# # - all lie between 0.25.0 .. 0.26.0
# # - 25d65b9e6ebde26087be6414e41cf516599c3469 2023/03/12 phosh-private: Forward key release as well
# # idle inhibit 2023/03/14
# # - 20e7b26af16e9d9c22cba4550f922b90b80b6df6
# # - b081ef963154c7c94a6ab33376a712b3efe17545
# # screen blank fix (NOPE: this one is OK)
# # - 37542bb80be8a7746d2ccda0c02048dd92fac7af 2023/03/11
2023-05-15 22:08:09 +00:00
# saneCommit = "12e89c9d26b7a1a79f6b8b2f11fce0dd8f4d5197";
# hash = "sha256-IJNBVr2xAwQW4SAJvq4XQYW4D5tevvd9zRrgXYmm38g=";
# })
# (fetchpatch' {
# # phosh: 0.25.1 -> 0.27.0
# # TODO: fix Calls:
# # > Failed to get emergency contacts: GDBus.Error:org.freedesktop.DBus.Error.ServiceUnknown: The name org.gnome.Calls was not provided by any .service files
# saneCommit = "c8fa213c7cb357c0ca0d5bea66278362a47caeb8";
# hash = "sha256-I8IZ8fjJstmcIXEN622/A1w2uHDACwXFl1WbXTWOyi4=";
# })
2023-05-15 19:42:28 +00:00
# (fetchpatch' {
# # phosh-mobile-settings: 0.23.1 -> 0.27.0
# # branch: pr/sane/phosh-mobile-settings-0.27.0
# # TODO: fix feedback section
# # > Settings schema 'org.gtk.gtk4.Settings.FileChooser' is not installed
# # ^ is that provided by nautilus?
# saneCommit = "8952f79699d3b0d72d9f6efb022e826175b143a6";
# hash = "sha256-myKKMt5cZhC0mfPhEsNjwKjaIYICj5LBJqV01HghYUg=";
# })
2023-05-15 11:01:02 +00:00
2023-04-21 19:41:42 +00:00
# 2023-04-20: perl: fix modules for compatibility with miniperl
# (fetchpatch {
# url = "https://github.com/NixOS/nixpkgs/pull/225640.diff";
# hash = "sha256-MNG8C0OgdPnFQ8SF2loiEhXJuP2z4n9pkXr8Zh4X7QU=";
# })
2023-05-18 11:07:36 +00:00
( fetchpatch' {
2023-07-12 02:09:34 +00:00
title = " c o n k y : s u p p o r t w a y l a n d " ;
2023-07-13 11:06:34 +00:00
# saneCommit = "82978099c3a0d5fb4925351da1b0e2598503dc6c";
# hash = "sha256-lnDGEDhmeOIXfFnizEIVUiUzI7nMvpoCERbdjhR+Bto=";
saneCommit = " 3 a d 9 2 8 e 2 0 b 4 9 8 4 4 4 e 3 a 1 0 6 b 1 8 2 e 0 9 3 1 7 c e a 9 a 1 1 f " ;
hash = " s h a 2 5 6 - l v I A S v Q W V F b j H s Q w O 2 E h E B U T S q 1 U k H v r i a Z Z 2 i S 0 u l U = " ;
2023-05-18 11:07:36 +00:00
} )
2023-05-24 03:57:35 +00:00
# (fetchpatch' {
2023-05-24 23:08:12 +00:00
# title = "hare-json: init at unstable-2023-01-31";
# saneCommit = "260f9c6ac4e3564acbceb46aa4b65fbb652f8e23";
# hash = "sha256-bjLKANo0+zaxugJlEk1ObPqRHWOKptD7dXB+/xzsYqA=";
2023-05-24 03:57:35 +00:00
# })
2023-05-24 05:52:17 +00:00
# (fetchpatch' {
2023-05-24 23:08:12 +00:00
# title = "hare-ev: init at unstable-2022-12-29";
# saneCommit = "4058200a407c86c5d963bc49b608aa1a881cbbf2";
# hash = "sha256-wm1aavbCfxBhcOXh4EhFO4u0LrA9tNr0mSczHUK8mQU=";
2023-05-24 05:52:17 +00:00
# })
# (fetchpatch' {
2023-05-24 23:08:12 +00:00
# title = "bonsai: init at 1.0.0";
# saneCommit = "65d37294d939384e8db400ea82d25ce8b4ad6897";
# hash = "sha256-2easgOtJfzvVcz/3nt3lo1GKLLotrM4CkBRyTgIAhHU=";
2023-05-24 05:52:17 +00:00
# })
2023-05-23 01:02:35 +00:00
( fetchpatch' {
2023-05-24 23:08:12 +00:00
title = " b o n s a i : i n i t a t 1 . 0 . 0 " ;
prUrl = " h t t p s : / / g i t h u b . c o m / N i x O S / n i x p k g s / p u l l / 2 3 3 8 9 2 " ;
2023-07-05 09:03:25 +00:00
hash = " s h a 2 5 6 - H q t D g i s b R 0 x O U Y 4 A x h z E v + 2 J J M P y Q M a w K o 6 n b d 9 p x h E = " ;
2023-05-23 01:02:35 +00:00
} )
2023-06-01 09:19:45 +00:00
# make alsa-project members overridable
./2023-05-31-toplevel-alsa.patch
2023-06-08 05:11:06 +00:00
# qt6 qtwebengine: specify `python` as buildPackages
./2023-06-02-qt6-qtwebengine-cross.patch
2023-06-08 08:26:45 +00:00
# Jellyfin: don't build via `libsForQt5.callPackage`
./2023-06-06-jellyfin-no-libsForQt5-callPackage.patch
2023-06-11 12:12:41 +00:00
# pin to a pre-0.17.3 release
2023-06-28 19:27:06 +00:00
# removing this and using stock 0.17.3 (also 0.17.4) causes:
2023-06-11 12:12:41 +00:00
# INFO lemmy_server::code_migrations: No Local Site found, creating it.
# Error: LemmyError { message: None, inner: duplicate key value violates unique constraint "local_site_site_id_key", context: "SpanTrace" }
# more specifically, lemmy can't find the site because it receives an error from diesel:
# Err(DeserializationError("Unrecognized enum variant"))
# this is likely some mis-ordered db migrations
# or perhaps the whole set of migrations here isn't being running right.
# related: <https://github.com/NixOS/nixpkgs/issues/236890#issuecomment-1585030861>
2023-06-28 19:27:06 +00:00
# ./2023-06-10-lemmy-downgrade.patch
2023-06-11 12:12:41 +00:00
2023-06-14 07:39:18 +00:00
# (fetchpatch' {
# title = "gpodder: wrap with missing `xdg-utils` path";
# saneCommit = "10d0ac11bc083cbcf0d6340950079b3888095abf";
# hash = "sha256-cu8L30ZiUJnWFGRR/SK917TC7TalzpGkurGkUAAxl54=";
# })
2023-06-19 08:02:54 +00:00
( fetchpatch' {
title = " k o r e a d e r : 2 0 2 3 . 0 4 - > 2 0 2 3 . 0 5 . 1 " ;
saneCommit = " a 5 c 4 7 1 b d 2 6 3 a b e 9 3 e 2 9 1 2 3 9 e 0 0 7 8 a c 4 2 5 5 a 9 4 2 6 2 " ;
2023-07-05 09:03:25 +00:00
hash = " s h a 2 5 6 - 3 8 s N D / U N R j 5 W A Y Y K p z d r R B I O K 4 U A T 1 4 R z b I v 4 9 K m N N w = " ;
2023-06-19 08:02:54 +00:00
} )
2023-06-25 18:04:19 +00:00
( fetchpatch' {
2023-07-05 09:03:25 +00:00
# TODO: send this upstream!
2023-06-25 18:04:19 +00:00
title = " m e p o : 1 . 1 - > 1 . 1 . 2 " ;
saneCommit = " e e e 6 8 d 7 1 4 6 a 6 c d 9 8 5 4 8 1 c d d 8 b c a 5 2 f f b 2 0 4 d e 4 2 3 " ;
2023-06-27 06:41:03 +00:00
hash = " s h a 2 5 6 - u N e r T w y F z i v T U + o 9 b E K m N M F c e O m y 2 A K O N f K J W I 5 q k z o = " ;
2023-06-25 18:04:19 +00:00
} )
2023-06-29 09:43:17 +00:00
( fetchpatch' {
title = " g t h u m b : m a k e t h e w e b s e r v i c e s f e a t u r e b e o p t i o n a l " ;
2023-07-05 09:03:25 +00:00
prUrl = " h t t p s : / / g i t h u b . c o m / N i x O S / n i x p k g s / p u l l / 2 4 0 6 0 2 " ;
2023-06-29 09:43:17 +00:00
saneCommit = " 5 0 7 6 7 d 5 7 4 6 f d 8 0 6 5 7 e 9 9 7 b 4 3 f c 5 d 8 2 b a 0 c 2 c 2 4 4 7 " ;
hash = " s h a 2 5 6 - l X u L H d S P h W o l 9 X 5 Q X 4 c x n Z q o V G U W E Q T C Z L m o s v L X + W Y = " ;
} )
2023-07-12 07:45:41 +00:00
2023-07-18 01:32:50 +00:00
( fetchpatch' {
title = " g n u s t e p : r e m o v e ` r e c ` t o s u p p o r t ` o v e r r i d e S c o p e ` " ;
saneCommit = " 6 9 1 6 2 c b f 7 2 7 2 6 4 e 5 0 f c 9 d 7 2 2 2 a 0 3 7 8 9 d 1 2 6 4 4 7 0 5 " ;
hash = " s h a 2 5 6 - r D 0 e s 4 u U b a L M r I 9 Z B 2 H z P m R L y u / i x N B L A F y D J t F H N k o = " ;
} )
2023-07-25 12:38:19 +00:00
( fetchpatch' {
title = " p 1 1 - k i t : b u i l d w i t h m e s o n " ;
prUrl = " h t t p s : / / g i t h u b . c o m / N i x O S / n i x p k g s / p u l l / 2 4 4 6 3 3 " ;
hash = " s h a 2 5 6 - + z 6 h o s S y t 6 y n L p U K S 0 T s H R o L O S 8 c k / S K 9 Y 7 W 2 z V U n C Q = " ;
} )
( fetchpatch' {
title = " p 1 1 - k i t : u s e m e s o n E m u l a t o r H o o k f o r c r o s s c o m p i l a t i o n " ;
prUrl = " h t t p s : / / g i t h u b . c o m / N i x O S / n i x p k g s / p u l l / 2 4 5 1 2 4 " ;
hash = " s h a 2 5 6 - 8 N q q L B b j t 1 f L j 4 Z Y h a t 7 w P q Q S v / a e z 9 I w g S K 2 b 4 C f W 8 = " ;
} )
2023-07-26 22:12:25 +00:00
( fetchpatch' {
title = " l i b g u d e v : f i x c r o s s f a i l i n g t o b u i l d c h e c k s " ;
prUrl = " h t t p s : / / g i t h u b . c o m / N i x O S / n i x p k g s / p u l l / 2 4 5 7 6 1 " ;
hash = " s h a 2 5 6 - j E Q e G A c D G r v 0 T Y o u B T f n 5 u b W a o s W g / e c m U W 0 i i 1 Q I V s = " ;
} )
2023-06-21 06:13:27 +00:00
# (fetchpatch' {
# # N.B.: compiles, but runtime error on launch suggestive of some module not being shipped
# title = "matrix-appservice-irc: 0.38.0 -> 1.0.0";
# saneCommit = "b168bf862d53535151b9142a15fbd53e18e688c5";
# hash = "sha256-dDa2mrCJ416PIYsDH9ya/4aQdqtp4BwzIisa8HdVFxo=";
# })
2022-10-09 01:21:38 +00:00
# for raspberry pi: allow building u-boot for rpi 4{,00}
# TODO: remove after upstreamed: https://github.com/NixOS/nixpkgs/pull/176018
# (it's a dupe of https://github.com/NixOS/nixpkgs/pull/112677 )
./02-rpi4-uboot.patch
2022-11-20 12:25:59 +00:00
# ./07-duplicity-rich-url.patch
2022-06-23 23:03:58 +00:00
]