From 951e05b4b794511edc00cae63f5a6f03d2b6f831 Mon Sep 17 00:00:00 2001 From: Samuel Tardieu Date: Fri, 25 Oct 2024 19:51:07 +0200 Subject: [PATCH 1/4] serd: set license as ISC instead of MIT According to the top-level COPYING, ISC is the right license to use. --- pkgs/development/libraries/serd/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/serd/default.nix b/pkgs/development/libraries/serd/default.nix index 51e1f0264805..ab7002c2c586 100644 --- a/pkgs/development/libraries/serd/default.nix +++ b/pkgs/development/libraries/serd/default.nix @@ -51,12 +51,12 @@ stdenv.mkDerivation rec { ''; }; - meta = with lib; { + meta = { description = "Lightweight C library for RDF syntax which supports reading and writing Turtle and NTriples"; homepage = "https://drobilla.net/software/serd"; - license = licenses.mit; + license = lib.licenses.isc; maintainers = [ ]; mainProgram = "serdi"; - platforms = platforms.unix; + platforms = lib.platforms.unix; }; } From de26abe63b3401b943aa7003a31177a8caadc054 Mon Sep 17 00:00:00 2001 From: Samuel Tardieu Date: Fri, 25 Oct 2024 19:52:04 +0200 Subject: [PATCH 2/4] serd: set myself as maintainer --- pkgs/development/libraries/serd/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/serd/default.nix b/pkgs/development/libraries/serd/default.nix index ab7002c2c586..23accbcfbe6b 100644 --- a/pkgs/development/libraries/serd/default.nix +++ b/pkgs/development/libraries/serd/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { description = "Lightweight C library for RDF syntax which supports reading and writing Turtle and NTriples"; homepage = "https://drobilla.net/software/serd"; license = lib.licenses.isc; - maintainers = [ ]; + maintainers = with lib.maintainers; [ samueltardieu ]; mainProgram = "serdi"; platforms = lib.platforms.unix; }; From 607282c12a5d8b1db0da9ef35f5bb25f50e05f2b Mon Sep 17 00:00:00 2001 From: Samuel Tardieu Date: Fri, 25 Oct 2024 16:35:59 +0200 Subject: [PATCH 3/4] =?UTF-8?q?serd:=200.30.16=20=E2=86=92=200.32.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/libraries/serd/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/serd/default.nix b/pkgs/development/libraries/serd/default.nix index 23accbcfbe6b..fd556b40f1cb 100644 --- a/pkgs/development/libraries/serd/default.nix +++ b/pkgs/development/libraries/serd/default.nix @@ -8,18 +8,19 @@ , pkg-config , python3 , sphinx +, sphinxygen , writeScript }: stdenv.mkDerivation rec { pname = "serd"; - version = "0.30.16"; + version = "0.32.2"; outputs = [ "out" "dev" "doc" "man" ]; src = fetchurl { url = "https://download.drobilla.net/${pname}-${version}.tar.xz"; - hash = "sha256-9Q9IbaUZzdjQOyDJ5CQU5FkTP1okRBHY5jyu+NmskUY="; + hash = "sha256-333CyW8rod7P11bkWOBh3tfYFY0lVVTnaTSDrAljxWs="; }; nativeBuildInputs = [ @@ -30,6 +31,7 @@ stdenv.mkDerivation rec { pkg-config python3 sphinx + sphinxygen ]; postPatch = '' From 3cd9ca4ee169ec1f0fecbaf1e332e189ad4afc4c Mon Sep 17 00:00:00 2001 From: Samuel Tardieu Date: Fri, 25 Oct 2024 16:42:45 +0200 Subject: [PATCH 4/4] serd: reformat file --- pkgs/development/libraries/serd/default.nix | 32 ++++++++++++--------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/pkgs/development/libraries/serd/default.nix b/pkgs/development/libraries/serd/default.nix index fd556b40f1cb..750591e0f2e2 100644 --- a/pkgs/development/libraries/serd/default.nix +++ b/pkgs/development/libraries/serd/default.nix @@ -1,22 +1,28 @@ -{ lib -, stdenv -, fetchurl -, doxygen -, mandoc -, meson -, ninja -, pkg-config -, python3 -, sphinx -, sphinxygen -, writeScript +{ + lib, + stdenv, + fetchurl, + doxygen, + mandoc, + meson, + ninja, + pkg-config, + python3, + sphinx, + sphinxygen, + writeScript, }: stdenv.mkDerivation rec { pname = "serd"; version = "0.32.2"; - outputs = [ "out" "dev" "doc" "man" ]; + outputs = [ + "out" + "dev" + "doc" + "man" + ]; src = fetchurl { url = "https://download.drobilla.net/${pname}-${version}.tar.xz";