diff options
author | Alyssa Ross <hi@alyssa.is> | 2022-01-03 23:55:00 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2022-02-19 11:03:39 +0000 |
commit | f4cf97a04cd5d0b86aa46baec9fb228a8f671c03 (patch) | |
tree | 28192415ff39a661d0001563bf81cc93fa25d16d /nixpkgs/pkgs/development/libraries/libe-book | |
parent | f8422837c9bde058e8f2de37702e7e94b2226040 (diff) | |
parent | 18c84ea816348e2a098390101b92d1e39a9dbd45 (diff) | |
download | nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.gz nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.bz2 nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.lz nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.xz nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.zst nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.zip |
Merge commit '18c84ea816348e2a098390101b92d1e39a9dbd45'
Conflicts: nixpkgs/nixos/modules/misc/documentation.nix nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix nixpkgs/pkgs/applications/window-managers/sway/default.nix nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix nixpkgs/pkgs/development/go-modules/generic/default.nix nixpkgs/pkgs/development/interpreters/ruby/default.nix nixpkgs/pkgs/development/interpreters/ruby/patchsets.nix nixpkgs/pkgs/development/libraries/boehm-gc/7.6.6.nix nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix nixpkgs/pkgs/servers/mail/mailman/web.nix nixpkgs/pkgs/top-level/aliases.nix nixpkgs/pkgs/top-level/all-packages.nix nixpkgs/pkgs/top-level/impure.nix
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/libe-book')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/libe-book/default.nix | 56 | ||||
-rw-r--r-- | nixpkgs/pkgs/development/libraries/libe-book/default.upstream | 4 |
2 files changed, 30 insertions, 30 deletions
diff --git a/nixpkgs/pkgs/development/libraries/libe-book/default.nix b/nixpkgs/pkgs/development/libraries/libe-book/default.nix index f467a01ea7ab..b3a1cab066e4 100644 --- a/nixpkgs/pkgs/development/libraries/libe-book/default.nix +++ b/nixpkgs/pkgs/development/libraries/libe-book/default.nix @@ -1,41 +1,45 @@ -{ lib, stdenv, fetchurl, gperf, pkg-config, librevenge, libxml2, boost, icu -, cppunit, zlib, liblangtag +{ lib +, stdenv +, fetchurl +, gperf +, pkg-config +, librevenge +, libxml2 +, boost +, icu +, cppunit +, zlib +, liblangtag }: -let - s = # Generated upstream information - rec { - baseName="libe-book"; - version="0.1.3"; - name="${baseName}-${version}"; - hash="1yg1vws1wggzhjw672bpgh2x541g5i9wryf67g51m0r79zrqz3by"; - url="https://kent.dl.sourceforge.net/project/libebook/libe-book-0.1.3/libe-book-0.1.3.tar.xz"; - sha256="1yg1vws1wggzhjw672bpgh2x541g5i9wryf67g51m0r79zrqz3by"; +stdenv.mkDerivation rec { + pname = "libe-book"; + version = "0.1.3"; + src = fetchurl { + url = "https://kent.dl.sourceforge.net/project/libebook/libe-book-${version}/libe-book-${version}.tar.xz"; + sha256 = "sha256-fo2P808ngxrKO8b5zFMsL5DSBXx3iWO4hP89HjTf4fk="; }; - nativeBuildInputs = [ pkg-config ]; buildInputs = [ - gperf librevenge libxml2 boost icu cppunit zlib liblangtag + gperf + librevenge + libxml2 + boost + icu + cppunit + zlib + liblangtag ]; - # Boost 1.59 compatability fix # Attempt removing when updating postPatch = '' sed -i 's,^CPPFLAGS.*,\0 -DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED,' src/lib/Makefile.in ''; -in -stdenv.mkDerivation { - inherit (s) name version; - inherit nativeBuildInputs buildInputs postPatch; - src = fetchurl { - inherit (s) url sha256; - }; NIX_CFLAGS_COMPILE = "-Wno-error=unused-function"; - meta = { - inherit (s) version; + meta = with lib; { description = "Library for import of reflowable e-book formats"; - license = lib.licenses.lgpl21Plus ; - maintainers = [lib.maintainers.raskin]; - platforms = lib.platforms.unix; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ raskin ]; + platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/libraries/libe-book/default.upstream b/nixpkgs/pkgs/development/libraries/libe-book/default.upstream deleted file mode 100644 index a06a9af99bb4..000000000000 --- a/nixpkgs/pkgs/development/libraries/libe-book/default.upstream +++ /dev/null @@ -1,4 +0,0 @@ -url https://sourceforge.net/projects/libebook/files/ -SF_version_dir libe-book- -version_link '[.]tar.xz/download$' -SF_redirect |