From 760688e21b2ccef160ec61f9003d9509de9726d1 Mon Sep 17 00:00:00 2001 From: devhell Date: Sat, 23 Mar 2024 14:34:37 +0000 Subject: [PATCH 1/2] libstrophe: move to by-name structure --- .../default.nix => by-name/li/libstrophe/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{development/libraries/libstrophe/default.nix => by-name/li/libstrophe/package.nix} (100%) diff --git a/pkgs/development/libraries/libstrophe/default.nix b/pkgs/by-name/li/libstrophe/package.nix similarity index 100% rename from pkgs/development/libraries/libstrophe/default.nix rename to pkgs/by-name/li/libstrophe/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6893dcfabdc3..415831c5913c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23078,8 +23078,6 @@ with pkgs; libstroke = callPackage ../development/libraries/libstroke { }; - libstrophe = callPackage ../development/libraries/libstrophe { }; - libspatialaudio = callPackage ../development/libraries/libspatialaudio { }; libspatialindex = callPackage ../development/libraries/libspatialindex { }; From ca5e6189d42a8d27bbc133f23479d9b8011bb51b Mon Sep 17 00:00:00 2001 From: devhell Date: Sat, 23 Mar 2024 14:38:50 +0000 Subject: [PATCH 2/2] libstrophe: 0.12.3 -> 0.13.1 --- pkgs/by-name/li/libstrophe/package.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/li/libstrophe/package.nix b/pkgs/by-name/li/libstrophe/package.nix index 880d468cae05..81c31d5f8026 100644 --- a/pkgs/by-name/li/libstrophe/package.nix +++ b/pkgs/by-name/li/libstrophe/package.nix @@ -6,24 +6,27 @@ , expat , pkg-config , check +, zlib }: stdenv.mkDerivation rec { pname = "libstrophe"; - version = "0.12.3"; + version = "0.13.1"; src = fetchFromGitHub { owner = "strophe"; repo = pname; rev = version; - sha256 = "EDgdKJ7wqUoThy0t1r39p2lbn64uvTDoIqNCzhpWnZ8="; + hash = "sha256-JMuvWspgXs+1dVWoo6kJVaf6cVvYj8lhyyu4ZILKeOg="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ openssl expat libtool check ]; + buildInputs = [ openssl expat libtool check zlib ]; dontDisableStatic = true; + strictDeps = true; + doCheck = true; meta = with lib; {