From f4dc8f8e7994f45bbedca8034d64fff197528e54 Mon Sep 17 00:00:00 2001
From: Alexis Hildebrandt <afh@surryhill.net>
Date: Fri, 17 May 2024 00:17:54 +0200
Subject: [PATCH] sword: 1.8.1 -> 1.9.0

---
 .../sw/sword/package.nix}                     | 52 +++++++++++++------
 pkgs/top-level/all-packages.nix               |  2 -
 2 files changed, 36 insertions(+), 18 deletions(-)
 rename pkgs/{development/libraries/sword/default.nix => by-name/sw/sword/package.nix} (54%)

diff --git a/pkgs/development/libraries/sword/default.nix b/pkgs/by-name/sw/sword/package.nix
similarity index 54%
rename from pkgs/development/libraries/sword/default.nix
rename to pkgs/by-name/sw/sword/package.nix
index 8871a66fd8c9..c8382ccbaa7c 100644
--- a/pkgs/development/libraries/sword/default.nix
+++ b/pkgs/by-name/sw/sword/package.nix
@@ -1,32 +1,53 @@
-{ lib, stdenv, fetchurl, pkg-config, icu, clucene_core, curl }:
-
-stdenv.mkDerivation rec {
+{
+  lib,
+  stdenv,
+  fetchurl,
+  pkg-config,
+  icu,
+  clucene_core,
+  curl,
+}:
 
+stdenv.mkDerivation (finalAttrs: {
   pname = "sword";
-  version = "1.8.1";
+  version = "1.9.0";
 
   src = fetchurl {
-    url = "https://www.crosswire.org/ftpmirror/pub/sword/source/v1.8/${pname}-${version}.tar.gz";
-    sha256 = "14syphc47g6svkbg018nrsgq4z6hid1zydax243g8dx747vsi6nf";
+    url = "https://www.crosswire.org/ftpmirror/pub/sword/source/v${lib.versions.majorMinor finalAttrs.version}/sword-${finalAttrs.version}.tar.gz";
+    hash = "sha256-QkCc894vrxEIUj4sWsB0XSH57SpceO2HjuncwwNCa4o=";
   };
 
   nativeBuildInputs = [ pkg-config ];
-  buildInputs = [ icu clucene_core curl ];
+  buildInputs = [
+    icu
+    clucene_core
+    curl
+  ];
+
+  outputs = [
+    "out"
+    "dev"
+  ];
 
   prePatch = ''
     patchShebangs .;
   '';
 
-  configureFlags = [ "--without-conf" "--enable-tests=no" ];
+  configureFlags = [
+    "--without-conf"
+    "--enable-tests=no"
+  ];
+
   CXXFLAGS = [
     "-Wno-unused-but-set-variable"
+    "-Wno-unknown-warning-option"
     # compat with icu61+ https://github.com/unicode-org/icu/blob/release-64-2/icu4c/readme.html#L554
     "-DU_USING_ICU_NAMESPACE=1"
   ];
 
-  meta = with lib; {
-    description = "A software framework that allows research manipulation of Biblical texts";
-    homepage = "http://www.crosswire.org/sword/";
+  meta = {
+    description = "Software framework that allows research manipulation of Biblical texts";
+    homepage = "https://www.crosswire.org/sword/";
     longDescription = ''
       The SWORD Project is the CrossWire Bible Society's free Bible software
       project. Its purpose is to create cross-platform open-source tools --
@@ -36,9 +57,8 @@ stdenv.mkDerivation rec {
       translators of the Bible, and have a growing collection of many hundred
       texts in around 100 languages.
     '';
-    license = licenses.gpl2;
-    maintainers = with maintainers; [ AndersonTorres ];
-    platforms = platforms.unix;
+    license = lib.licenses.gpl2;
+    maintainers = with lib.maintainers; [ AndersonTorres ];
+    platforms = lib.platforms.unix;
   };
-
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 160b65391fea..586b593d92dd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -24565,8 +24565,6 @@ with pkgs;
 
   swiftclient = with python3Packages; toPythonApplication python-swiftclient;
 
-  sword = callPackage ../development/libraries/sword { };
-
   biblesync = callPackage ../development/libraries/biblesync { };
 
   szip = callPackage ../development/libraries/szip { };