colin/nix-files
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

cozy: 1.2.1 -> 1.3.0

Browse Source
This commit is contained in:
Colin
2024-03-04 08:57:52 +00:00
parent 3b8252fe43
commit 5f3ef37050
2 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
nixpatches/list.nix
View File

@@ -32,6 +32,12 @@ in [
# etc, where "date" is like "20240228181608" # etc, where "date" is like "20240228181608"
# and can be found with `nix-repl > :lf . > lastModifiedDate` # and can be found with `nix-repl > :lf . > lastModifiedDate`
(fetchpatch' {
prUrl = "https://github.com/NixOS/nixpkgs/pull/291400";
title = "cozy: 1.2.1 -> 1.3.0";
hash = "sha256-gu1Ni7orOFfZNwqA41Uq5gCC/2TdiUB8YeSLsZYn4H4=";
})
(fetchpatch' { (fetchpatch' {
prUrl = "https://github.com/NixOS/nixpkgs/pull/292868"; prUrl = "https://github.com/NixOS/nixpkgs/pull/292868";
saneCommit = "f090c1cd6bb5bbb14a86ec90ced78ca1a165a4fe"; saneCommit = "f090c1cd6bb5bbb14a86ec90ced78ca1a165a4fe";

10
pkgs/patched/cozy/default.nix
View File

@@ -1,14 +1,4 @@
{ cozy, fetchpatch }: cozy.overrideAttrs (upstream: { { cozy, fetchpatch }: cozy.overrideAttrs (upstream: {
patches = upstream.patches or [] ++ [
(fetchpatch {
# 2023/03/29: Fix "invalid version" crash on startup
# - 2023/09/15: still not merged upstream
# - 2023/12/11: merged; remove on next release?
# - 2024/03/03: available in 1.3.0 release
url = "https://github.com/geigi/cozy/pull/762.diff";
hash = "sha256-Wk03NGVU7OsQu3AGILtRsQX2r+wPOt5U85cOWu4q6Uo=";
})
];
postPatch = (upstream.postPatch or "") + '' postPatch = (upstream.postPatch or "") + ''
# disable all reporting. # disable all reporting.
# this can be done via the settings, but that's troublesome and easy to forget. # this can be done via the settings, but that's troublesome and easy to forget.