diff options
| author | Bobby Rong <rjl931189261@126.com> | 2022-07-30 12:11:32 +0800 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2022-09-24 00:45:08 +0200 |
| commit | 99a7a3b24a6dc279c005a5bb25b13d0d1b16c85c (patch) | |
| tree | 6b0ccc9cfbb7802ffa0e0bc395baf0f0975a402d | |
| parent | endeavour: rename from gnome.gnome-todo (diff) | |
| download | nixpkgs-99a7a3b24a6dc279c005a5bb25b13d0d1b16c85c.tar.gz | |
endeavour: unstable-2022-06-12 → 42.0
https://gitlab.gnome.org/World/Endeavour/-/compare/f50c981b4d6875d5...v42.0
| -rw-r--r-- | pkgs/applications/misc/endeavour/default.nix | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/pkgs/applications/misc/endeavour/default.nix b/pkgs/applications/misc/endeavour/default.nix index 18ff848fbcd7..b204eab9acd7 100644 --- a/pkgs/applications/misc/endeavour/default.nix +++ b/pkgs/applications/misc/endeavour/default.nix @@ -22,19 +22,19 @@ , librest , json-glib , itstool -, unstableGitUpdater +, gitUpdater }: stdenv.mkDerivation rec { pname = "endeavour"; - version = "unstable-2022-06-12"; + version = "42.0"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "Endeavour"; - rev = "ad4e15f0b58860caf8c6d497795b83b594a9c3e5"; - sha256 = "HRufLoZou9ssQ/qoDG8anhOAtl8IYvFpyjq/XJlsotQ="; + rev = "v${version}"; + sha256 = "U91WAoyIeQ0WbFbOCrbFJjbWe2eT7b/VL2M1hNXxyzQ="; }; patches = [ @@ -45,6 +45,13 @@ stdenv.mkDerivation rec { extraPrefix = ""; name = "gnome-todo_meson-build.patch"; }) + + # build: Fix building with -Werror=format-security + # https://gitlab.gnome.org/World/Endeavour/-/merge_requests/132 + (fetchpatch { + url = "https://gitlab.gnome.org/World/Endeavour/-/commit/3bad03e90fcc28f6e3f87f2c90df5984dbeb0791.patch"; + sha256 = "sha256-HRkNfhn+EH0Fc+KBDdX1Q+T9QWSctTOn1cvecP2N0zo="; + }) ]; nativeBuildInputs = [ @@ -81,8 +88,9 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = unstableGitUpdater { - url = "https://gitlab.gnome.org/World/Endeavour.git"; + updateScript = gitUpdater { + inherit pname version; + rev-prefix = "v"; }; }; |