diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-09-27 16:00:58 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-09-27 16:00:58 +0000 |
| commit | c504e5d19d940926b3ddcf62c983d66f49f3cbb2 (patch) | |
| tree | ec955e58bcac2cb93b9f8c10786b23f61d40cd7e /nixpkgs/pkgs/applications/editors/apostrophe/default.nix | |
| parent | 72789cefce7b17419815f600fbd18238d89afcc9 (diff) | |
| parent | 1737f98af6667560e3e4f930312f9b5002649d04 (diff) | |
| download | nixlib-c504e5d19d940926b3ddcf62c983d66f49f3cbb2.tar nixlib-c504e5d19d940926b3ddcf62c983d66f49f3cbb2.tar.gz nixlib-c504e5d19d940926b3ddcf62c983d66f49f3cbb2.tar.bz2 nixlib-c504e5d19d940926b3ddcf62c983d66f49f3cbb2.tar.lz nixlib-c504e5d19d940926b3ddcf62c983d66f49f3cbb2.tar.xz nixlib-c504e5d19d940926b3ddcf62c983d66f49f3cbb2.tar.zst nixlib-c504e5d19d940926b3ddcf62c983d66f49f3cbb2.zip | |
Merge commit '1737f98af6667560e3e4f930312f9b5002649d04'
Conflicts: nixpkgs/nixos/modules/services/networking/ssh/sshd.nix nixpkgs/pkgs/applications/networking/irc/weechat/scripts/default.nix nixpkgs/pkgs/development/node-packages/default.nix nixpkgs/pkgs/development/python-modules/priority/deadline.patch
Diffstat (limited to 'nixpkgs/pkgs/applications/editors/apostrophe/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/applications/editors/apostrophe/default.nix | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/nixpkgs/pkgs/applications/editors/apostrophe/default.nix b/nixpkgs/pkgs/applications/editors/apostrophe/default.nix index df0be4ccfbea..e5cfeb964bd7 100644 --- a/nixpkgs/pkgs/applications/editors/apostrophe/default.nix +++ b/nixpkgs/pkgs/applications/editors/apostrophe/default.nix @@ -1,8 +1,8 @@ -{ lib, stdenv, fetchFromGitLab, meson, ninja, cmake +{ lib, stdenv, fetchFromGitLab, meson, ninja , wrapGAppsHook, pkg-config, desktop-file-utils , appstream-glib, pythonPackages, glib, gobject-introspection , gtk3, webkitgtk, glib-networking, gnome, gspell, texlive -, shared-mime-info, libhandy, fira +, shared-mime-info, libhandy, fira, sassc }: let @@ -13,18 +13,18 @@ let in stdenv.mkDerivation rec { pname = "apostrophe"; - version = "2.4"; + version = "2.5"; src = fetchFromGitLab { - owner = "somas"; + owner = "World"; repo = pname; domain = "gitlab.gnome.org"; rev = "v${version}"; - sha256 = "1qzy3zhi18wf42m034s8kcmx9gl05j620x3hf6rnycq2fvy7g4gz"; + sha256 = "06yfiflmj3ip7ppcz41nb3xpgb5ggw5h74w0v87yaqqkq7qh31lp"; }; - nativeBuildInputs = [ meson ninja cmake pkg-config desktop-file-utils - appstream-glib wrapGAppsHook ]; + nativeBuildInputs = [ meson ninja pkg-config desktop-file-utils + appstream-glib wrapGAppsHook sassc ]; buildInputs = [ glib pythonEnv gobject-introspection gtk3 gnome.adwaita-icon-theme webkitgtk gspell texlive @@ -49,7 +49,7 @@ in stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "https://gitlab.gnome.org/somas/apostrophe"; + homepage = "https://gitlab.gnome.org/World/apostrophe"; description = "A distraction free Markdown editor for GNU/Linux"; license = licenses.gpl3; platforms = platforms.linux; |