diff options
| author | José Romildo <malaquias@gmail.com> | 2023-04-01 21:48:57 -0300 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2023-04-08 10:17:35 +0000 |
| commit | be365405c9df1b2ab4c3f34c7b32a92c18e9bde3 (patch) | |
| tree | 6992dd33d3db0bf01d17cab84cf44c830e758aad | |
| parent | Merge pull request #224028 from NixOS/backport-223205-to-release-22.11 (diff) | |
| download | nixpkgs-origin/backport-224297-to-release-22.11.tar.gz | |
liferea: 1.14.3 -> 1.14.4origin/backport-224297-to-release-22.11
(cherry picked from commit 972f685682e797dfede1cdd78af9531e369a874d)
| -rw-r--r-- | pkgs/applications/networking/newsreaders/liferea/bug-1217-segfaults.patch | 21 | ||||
| -rw-r--r-- | pkgs/applications/networking/newsreaders/liferea/default.nix | 9 |
2 files changed, 2 insertions, 28 deletions
diff --git a/pkgs/applications/networking/newsreaders/liferea/bug-1217-segfaults.patch b/pkgs/applications/networking/newsreaders/liferea/bug-1217-segfaults.patch deleted file mode 100644 index 572619d51588..000000000000 --- a/pkgs/applications/networking/newsreaders/liferea/bug-1217-segfaults.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -pru liferea-1.14.3-orig/src/common.c liferea-1.14.3/src/common.c ---- liferea-1.14.3-orig/src/common.c 2023-03-23 20:36:21.000000000 +0100 -+++ liferea-1.14.3/src/common.c 2023-03-24 23:34:08.971922545 +0100 -@@ -85,6 +85,8 @@ common_init_paths (void) - common_check_dir (g_build_filename (g_get_user_config_dir(), "liferea", NULL)); - common_check_dir (g_build_filename (g_get_user_data_dir(), "liferea", NULL)); - -+ pathsChecked = TRUE; -+ - /* Install default stylesheet if it does not yet exist */ - filename = common_create_config_filename ("liferea.css"); - if (!g_file_test (filename, G_FILE_TEST_EXISTS)) -@@ -95,8 +97,6 @@ common_init_paths (void) - umask (077); - - g_free (lifereaCachePath); -- -- pathsChecked = TRUE; - } - - gchar * diff --git a/pkgs/applications/networking/newsreaders/liferea/default.nix b/pkgs/applications/networking/newsreaders/liferea/default.nix index f67bb6e4167c..d7966e3fc4e5 100644 --- a/pkgs/applications/networking/newsreaders/liferea/default.nix +++ b/pkgs/applications/networking/newsreaders/liferea/default.nix @@ -24,18 +24,13 @@ stdenv.mkDerivation rec { pname = "liferea"; - version = "1.14.3"; + version = "1.14.4"; src = fetchurl { url = "https://github.com/lwindolf/${pname}/releases/download/v${version}/${pname}-${version}.tar.bz2"; - sha256 = "VmEyGXrePdnRzRldSOOfiB55KBu7w9x4Y9vA8gufot4="; + sha256 = "MD1Qx+4/y1wdIllHFPuthLZMLiMdox0FFpVE7tcdYu8="; }; - patches = [ - # https://github.com/lwindolf/liferea/issues/1217 - ./bug-1217-segfaults.patch - ]; - nativeBuildInputs = [ wrapGAppsHook python3Packages.wrapPython |