Merge pull request #164756 from armeenm/bump-bookworm

This commit is contained in:
Sandro 2022-03-23 04:08:39 +01:00 committed by GitHub
commit 588dd979e7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1,42 +1,67 @@
{ lib, stdenv, fetchFromGitHub, pantheon, vala, python3, python2, pkg-config, libxml2, meson, ninja, gtk3, glib, webkitgtk, libgee { lib
, gobject-introspection, sqlite, poppler, poppler_utils, html2text, curl, gnugrep, coreutils, bash, unzip, unar, wrapGAppsHook , stdenv
, appstream, desktop-file-utils }: , 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 { stdenv.mkDerivation rec {
pname = "bookworm"; pname = "bookworm";
version = "1.1.2"; version = "unstable-2022-01-09";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "babluboy"; owner = "babluboy";
repo = pname; repo = pname;
rev = version; rev = "f3df858ce748a6bbc43f03a6e261ff76a6d7d303";
sha256 = "0w0rlyahpgx0l6inkbj106agbnr2czil0vdcy1zzv70apnjz488j"; hash = "sha256-mLyJfblF5WnWBV3rX1ZRupccou4t5mBpo3W7+ECNMVI=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
bash bash
gobject-introspection
libxml2
meson meson
ninja ninja
pkg-config pkg-config
python3
vala vala
wrapGAppsHook wrapGAppsHook
]; ];
buildInputs = [ buildInputs = [
pantheon.granite
glib
libgee
gtk3
html2text
poppler
python2
sqlite
webkitgtk
appstream appstream
desktop-file-utils desktop-file-utils
glib
gobject-introspection
gtk3
html2text
libgee
libxml2
pantheon.granite
poppler
python3
sqlite
webkitgtk
]; ];
postPatch = '' postPatch = ''
@ -66,4 +91,4 @@ stdenv.mkDerivation rec {
license = licenses.gpl3Plus; license = licenses.gpl3Plus;
platforms = platforms.linux; platforms = platforms.linux;
}; };
} }