gnome 44 -> 45
This commit is contained in:
parent
70b273a0d2
commit
beb13b8f84
|
@ -23,6 +23,17 @@ let
|
||||||
// (if title != null then { name = title; } else {})
|
// (if title != null then { name = title; } else {})
|
||||||
);
|
);
|
||||||
in [
|
in [
|
||||||
|
(fetchpatch' {
|
||||||
|
# needed for Gnome 44 -> 45 patch to apply
|
||||||
|
title = "telegram-desktop: build on Darwin";
|
||||||
|
prUrl = "https://github.com/NixOS/nixpkgs/pull/268592";
|
||||||
|
hash = "sha256-NqlXr739BbSouQ9ubo7s2rilWa3i/G0UlzH4JqXH3aw=";
|
||||||
|
})
|
||||||
|
(fetchpatch' {
|
||||||
|
title = "Gnome 44 -> 45";
|
||||||
|
prUrl = "https://github.com/NixOS/nixpkgs/pull/269032";
|
||||||
|
hash = "sha256-sxI5DXCzs6U8XDRTP0T4dOhEXCVxB5vUKyjNd46vmE8=";
|
||||||
|
})
|
||||||
(fetchpatch' {
|
(fetchpatch' {
|
||||||
# build fix: merged 2023/11/17
|
# build fix: merged 2023/11/17
|
||||||
title = "python2/mk-python-derivation: disable catchConflictsHook";
|
title = "python2/mk-python-derivation: disable catchConflictsHook";
|
||||||
|
|
|
@ -126,7 +126,6 @@ let
|
||||||
|
|
||||||
# jackett doesn't allow customization of the bind address: this will probably always be here.
|
# jackett doesn't allow customization of the bind address: this will probably always be here.
|
||||||
jackett = callPackage ./patched/jackett { inherit (unpatched) jackett; };
|
jackett = callPackage ./patched/jackett { inherit (unpatched) jackett; };
|
||||||
libgweather = callPackage ./patched/libgweather { inherit (unpatched) libgweather; };
|
|
||||||
|
|
||||||
# modemmanager = callPackage ./patched/modemmanager { inherit (unpatched) modemmanager; };
|
# modemmanager = callPackage ./patched/modemmanager { inherit (unpatched) modemmanager; };
|
||||||
|
|
||||||
|
|
|
@ -1,18 +0,0 @@
|
||||||
{ lib
|
|
||||||
, libgweather
|
|
||||||
, fetchpatch
|
|
||||||
, ...
|
|
||||||
}@attrs:
|
|
||||||
(libgweather.override
|
|
||||||
(removeAttrs attrs [ "fetchpatch" "libgweather" ])
|
|
||||||
).overrideAttrs (upstream: {
|
|
||||||
patches = lib.unique (
|
|
||||||
(upstream.patches or []) ++ [
|
|
||||||
(fetchpatch {
|
|
||||||
url = "https://gitlab.gnome.org/GNOME/libgweather/-/merge_requests/282.patch";
|
|
||||||
name = "nws: fix null string comparison when reading visibility";
|
|
||||||
hash = "sha256-yQncWfJJmXOTw8Kvxutjjlenjv1g5QR5JnLU4QhMXSo=";
|
|
||||||
})
|
|
||||||
]
|
|
||||||
);
|
|
||||||
})
|
|
Loading…
Reference in New Issue
Block a user