diff options
author | Alyssa Ross <hi@alyssa.is> | 2022-03-30 13:30:47 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2022-03-31 10:13:20 +0000 |
commit | f2e61678de300336b3666afd19af7565efb0c4cf (patch) | |
tree | 49f6906c9d557f7fdd58257ff85ec17fc4495f31 /nixpkgs/pkgs/applications/office/bookworm | |
parent | f920d5e07c29a9aa1b77d9b88bd604cf1a1f3664 (diff) | |
parent | 00e27c78d3d2de6964096ceee8d70e5b487365e3 (diff) | |
download | nixlib-f2e61678de300336b3666afd19af7565efb0c4cf.tar nixlib-f2e61678de300336b3666afd19af7565efb0c4cf.tar.gz nixlib-f2e61678de300336b3666afd19af7565efb0c4cf.tar.bz2 nixlib-f2e61678de300336b3666afd19af7565efb0c4cf.tar.lz nixlib-f2e61678de300336b3666afd19af7565efb0c4cf.tar.xz nixlib-f2e61678de300336b3666afd19af7565efb0c4cf.tar.zst nixlib-f2e61678de300336b3666afd19af7565efb0c4cf.zip |
Merge commit '00e27c78d3d2de6964096ceee8d70e5b487365e3'
Conflicts: nixpkgs/nixos/modules/system/boot/systemd.nix nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix nixpkgs/pkgs/applications/version-management/git-and-tools/cgit/common.nix nixpkgs/pkgs/applications/version-management/git-and-tools/cgit/default.nix nixpkgs/pkgs/applications/version-management/git-and-tools/cgit/pink.nix nixpkgs/pkgs/top-level/all-packages.nix
Diffstat (limited to 'nixpkgs/pkgs/applications/office/bookworm')
-rw-r--r-- | nixpkgs/pkgs/applications/office/bookworm/default.nix | 74 |
1 files changed, 49 insertions, 25 deletions
diff --git a/nixpkgs/pkgs/applications/office/bookworm/default.nix b/nixpkgs/pkgs/applications/office/bookworm/default.nix index 8bd1d8f974b3..9cdbd14e105c 100644 --- a/nixpkgs/pkgs/applications/office/bookworm/default.nix +++ b/nixpkgs/pkgs/applications/office/bookworm/default.nix @@ -1,43 +1,67 @@ -{ lib, stdenv, fetchFromGitHub, pantheon, vala, python3, python2, pkg-config, libxml2, meson, ninja, gtk3, glib, webkitgtk, libgee -, gobject-introspection, sqlite, poppler, poppler_utils, html2text, curl, gnugrep, coreutils, bash, unzip, unar, wrapGAppsHook -, appstream, desktop-file-utils }: +{ lib +, stdenv +, fetchFromGitHub +, appstream +, bash +, coreutils +, curl +, desktop-file-utils +, glib +, gnugrep +, gobject-introspection +, gtk3 +, html2text +, libgee +, libxml2 +, meson +, ninja +, pantheon +, pkg-config +, poppler +, poppler_utils +, python3 +, sqlite +, unar +, unzip +, vala +, webkitgtk +, wrapGAppsHook +}: stdenv.mkDerivation rec { pname = "bookworm"; - version = "1.1.2"; + version = "unstable-2022-01-09"; src = fetchFromGitHub { owner = "babluboy"; repo = pname; - rev = version; - sha256 = "0w0rlyahpgx0l6inkbj106agbnr2czil0vdcy1zzv70apnjz488j"; + rev = "f3df858ce748a6bbc43f03a6e261ff76a6d7d303"; + hash = "sha256-mLyJfblF5WnWBV3rX1ZRupccou4t5mBpo3W7+ECNMVI="; }; nativeBuildInputs = [ bash - gobject-introspection - libxml2 meson ninja pkg-config - python3 vala wrapGAppsHook ]; buildInputs = [ - pantheon.elementary-icon-theme - pantheon.granite + appstream + desktop-file-utils glib - libgee + gobject-introspection gtk3 html2text + libgee + libxml2 + pantheon.granite poppler - python2 + python3 sqlite webkitgtk - appstream - desktop-file-utils ]; postPatch = '' @@ -58,13 +82,13 @@ stdenv.mkDerivation rec { patchShebangs $out/share/bookworm/scripts/tasks/*.sh ''; - meta = with lib; { - description = "A simple, focused eBook reader"; - longDescription = '' - Read the books you love without having to worry about different format complexities like epub, pdf, mobi, cbr, etc. - ''; - homepage = "https://babluboy.github.io/bookworm/"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - }; - } + meta = with lib; { + description = "A simple, focused eBook reader"; + longDescription = '' + Read the books you love without having to worry about different format complexities like epub, pdf, mobi, cbr, etc. + ''; + homepage = "https://babluboy.github.io/bookworm/"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + }; +} |