From 01f3292dcadbf5868d816332cd48b221f7bd5c9e Mon Sep 17 00:00:00 2001 From: PopeRigby Date: Wed, 11 Sep 2024 12:38:20 -0700 Subject: [PATCH 01/13] tacent: init at 0.8.18 --- pkgs/by-name/ta/tacent/package.nix | 37 ++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 pkgs/by-name/ta/tacent/package.nix diff --git a/pkgs/by-name/ta/tacent/package.nix b/pkgs/by-name/ta/tacent/package.nix new file mode 100644 index 000000000000..3a5d8da766ba --- /dev/null +++ b/pkgs/by-name/ta/tacent/package.nix @@ -0,0 +1,37 @@ +{ + cmake, + fetchFromGitHub, + lib, + ninja, + stdenv, +}: + +stdenv.mkDerivation rec { + pname = "tacent"; + version = "0.8.18"; + + src = fetchFromGitHub { + owner = "bluescan"; + repo = "tacent"; + rev = version; + hash = "sha256-z8VuJS8OaVw5CeO/udvBEmcURKIy1oWVYUv6Ai8lTI8="; + }; + + nativeBuildInputs = [ + cmake + ninja + ]; + + meta = { + description = "C++ library providing linear algebra and various utility functions"; + longDescription = '' + A C++ library implementing linear algebra, text and file IO, UTF-N conversions, + containers, image loading/saving, image quantization/filtering, command-line parsing, etc. + ''; + homepage = "https://github.com/bluescan/tacent"; + license = lib.licenses.isc; + maintainers = with lib.maintainers; [ PopeRigby ]; + platforms = lib.platforms.linux; + }; + +} From 27a19594dce7571ab7db6b536981a1c423d7e98a Mon Sep 17 00:00:00 2001 From: PopeRigby Date: Wed, 11 Sep 2024 12:38:31 -0700 Subject: [PATCH 02/13] tacentview: init at 1.0.46 --- pkgs/by-name/ta/tacentview/package.nix | 69 ++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) create mode 100644 pkgs/by-name/ta/tacentview/package.nix diff --git a/pkgs/by-name/ta/tacentview/package.nix b/pkgs/by-name/ta/tacentview/package.nix new file mode 100644 index 000000000000..eb72b315e912 --- /dev/null +++ b/pkgs/by-name/ta/tacentview/package.nix @@ -0,0 +1,69 @@ +{ + autoPatchelfHook, + cmake, + fetchFromGitHub, + installShellFiles, + lib, + libGL, + ninja, + stdenv, + tacent, + xorg, + zenity, +}: + +stdenv.mkDerivation rec { + pname = "tacentview"; + version = "1.0.46"; + + src = fetchFromGitHub { + owner = "bluescan"; + repo = "tacentview"; + rev = "v${version}"; + hash = "sha256-d4A26p1hmkYEZ+h6kRbHHr4QmAc3PMe3qYdkeKIRGkU="; + }; + + nativeBuildInputs = [ + cmake + ninja + installShellFiles + autoPatchelfHook + ]; + + buildInputs = [ + stdenv.cc.cc.lib + tacent + xorg.libX11 + xorg.libxcb + zenity + ]; + + runtimeDependencies = [ libGL ]; + + cmakeFlags = [ + (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_TACENT" "${tacent.src}") + (lib.cmakeBool "PACKAGE_NIX" true) + ]; + + installPhase = '' + runHook preInstall + + installBin tacentview + + mkdir -p $out/share/tacentview + cp -r ../Assets $out/share/tacentview/ + cp -r ../Linux/deb_template/usr/share/icons $out/share + cp -r ../Linux/deb_template/usr/share/applications $out/share + + runHook postInstall + ''; + + meta = { + description = "Image and texture viewer"; + homepage = "https://github.com/bluescan/tacentview"; + license = lib.licenses.isc; + maintainers = with lib.maintainers; [ PopeRigby ]; + mainProgram = "tacentview"; + platforms = lib.platforms.all; + }; +} From 3d2755e0a57a286f3834a94e36b8e52a7955ab04 Mon Sep 17 00:00:00 2001 From: PopeRigby Date: Fri, 1 Nov 2024 00:40:23 -0700 Subject: [PATCH 03/13] Apply suggestions from code review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Gaétan Lepage <33058747+GaetanLepage@users.noreply.github.com> --- pkgs/by-name/ta/tacent/package.nix | 3 ++- pkgs/by-name/ta/tacentview/package.nix | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ta/tacent/package.nix b/pkgs/by-name/ta/tacent/package.nix index 3a5d8da766ba..6218bdcd5069 100644 --- a/pkgs/by-name/ta/tacent/package.nix +++ b/pkgs/by-name/ta/tacent/package.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "bluescan"; repo = "tacent"; - rev = version; + rev = "refs/tags/${version}"; hash = "sha256-z8VuJS8OaVw5CeO/udvBEmcURKIy1oWVYUv6Ai8lTI8="; }; @@ -29,6 +29,7 @@ stdenv.mkDerivation rec { containers, image loading/saving, image quantization/filtering, command-line parsing, etc. ''; homepage = "https://github.com/bluescan/tacent"; + changelog = "https://github.com/bluescan/tacent/releases/tag/v${version}"; license = lib.licenses.isc; maintainers = with lib.maintainers; [ PopeRigby ]; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/ta/tacentview/package.nix b/pkgs/by-name/ta/tacentview/package.nix index eb72b315e912..dc2ebb690f12 100644 --- a/pkgs/by-name/ta/tacentview/package.nix +++ b/pkgs/by-name/ta/tacentview/package.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "bluescan"; repo = "tacentview"; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-d4A26p1hmkYEZ+h6kRbHHr4QmAc3PMe3qYdkeKIRGkU="; }; @@ -61,6 +61,7 @@ stdenv.mkDerivation rec { meta = { description = "Image and texture viewer"; homepage = "https://github.com/bluescan/tacentview"; + changelog = "https://github.com/bluescan/tacentview/releases/tag/v${version}"; license = lib.licenses.isc; maintainers = with lib.maintainers; [ PopeRigby ]; mainProgram = "tacentview"; From 50924ca2b97e37e64d14f1ec35c39ab84d89d346 Mon Sep 17 00:00:00 2001 From: PopeRigby Date: Tue, 5 Nov 2024 10:20:27 -0800 Subject: [PATCH 04/13] Apply suggestions from code review Co-authored-by: Anderson Torres --- pkgs/by-name/ta/tacent/package.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/by-name/ta/tacent/package.nix b/pkgs/by-name/ta/tacent/package.nix index 6218bdcd5069..8c71431bf4a3 100644 --- a/pkgs/by-name/ta/tacent/package.nix +++ b/pkgs/by-name/ta/tacent/package.nix @@ -34,5 +34,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ PopeRigby ]; platforms = lib.platforms.linux; }; - } From f3dc5f775346a1e8b43da801af13b8ae5a6ad27b Mon Sep 17 00:00:00 2001 From: PopeRigby Date: Mon, 9 Dec 2024 14:26:21 -0800 Subject: [PATCH 05/13] Update pkgs/by-name/ta/tacentview/package.nix Co-authored-by: Leah Amelia Chen --- pkgs/by-name/ta/tacentview/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ta/tacentview/package.nix b/pkgs/by-name/ta/tacentview/package.nix index dc2ebb690f12..69fc778f72fd 100644 --- a/pkgs/by-name/ta/tacentview/package.nix +++ b/pkgs/by-name/ta/tacentview/package.nix @@ -65,6 +65,6 @@ stdenv.mkDerivation rec { license = lib.licenses.isc; maintainers = with lib.maintainers; [ PopeRigby ]; mainProgram = "tacentview"; - platforms = lib.platforms.all; + platforms = with lib.platforms; linux ++ windows; }; } From 3d99c241135c08eeffa58614b5a8faea8c9737af Mon Sep 17 00:00:00 2001 From: PopeRigby Date: Mon, 9 Dec 2024 14:35:13 -0800 Subject: [PATCH 06/13] Update pkgs/by-name/ta/tacentview/package.nix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Gaétan Lepage <33058747+GaetanLepage@users.noreply.github.com> --- pkgs/by-name/ta/tacentview/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ta/tacentview/package.nix b/pkgs/by-name/ta/tacentview/package.nix index 69fc778f72fd..9d1a19b41ca2 100644 --- a/pkgs/by-name/ta/tacentview/package.nix +++ b/pkgs/by-name/ta/tacentview/package.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "bluescan"; repo = "tacentview"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-d4A26p1hmkYEZ+h6kRbHHr4QmAc3PMe3qYdkeKIRGkU="; }; From 3993addae195a936379c21a3fdf60991f849a7c7 Mon Sep 17 00:00:00 2001 From: PopeRigby Date: Mon, 9 Dec 2024 14:35:24 -0800 Subject: [PATCH 07/13] Update pkgs/by-name/ta/tacent/package.nix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Gaétan Lepage <33058747+GaetanLepage@users.noreply.github.com> --- pkgs/by-name/ta/tacent/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ta/tacent/package.nix b/pkgs/by-name/ta/tacent/package.nix index 8c71431bf4a3..9f32779c97f9 100644 --- a/pkgs/by-name/ta/tacent/package.nix +++ b/pkgs/by-name/ta/tacent/package.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "bluescan"; repo = "tacent"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-z8VuJS8OaVw5CeO/udvBEmcURKIy1oWVYUv6Ai8lTI8="; }; From 3243543030d8bc5543451f9b5aeddc693f579fd7 Mon Sep 17 00:00:00 2001 From: PopeRigby Date: Mon, 9 Dec 2024 14:42:38 -0800 Subject: [PATCH 08/13] Fix formatting I'll squash this later --- pkgs/by-name/ta/tacent/package.nix | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/pkgs/by-name/ta/tacent/package.nix b/pkgs/by-name/ta/tacent/package.nix index 9f32779c97f9..e1d14b40c1bc 100644 --- a/pkgs/by-name/ta/tacent/package.nix +++ b/pkgs/by-name/ta/tacent/package.nix @@ -1,10 +1,4 @@ -{ - cmake, - fetchFromGitHub, - lib, - ninja, - stdenv, -}: +{ cmake, fetchFromGitHub, lib, ninja, stdenv, }: stdenv.mkDerivation rec { pname = "tacent"; @@ -13,17 +7,15 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "bluescan"; repo = "tacent"; - tag = version; + tag = version; hash = "sha256-z8VuJS8OaVw5CeO/udvBEmcURKIy1oWVYUv6Ai8lTI8="; }; - nativeBuildInputs = [ - cmake - ninja - ]; + nativeBuildInputs = [ cmake ninja ]; meta = { - description = "C++ library providing linear algebra and various utility functions"; + description = + "C++ library providing linear algebra and various utility functions"; longDescription = '' A C++ library implementing linear algebra, text and file IO, UTF-N conversions, containers, image loading/saving, image quantization/filtering, command-line parsing, etc. From 53ecadce602f6f6ba2c1f10e09c1c771e3c19adc Mon Sep 17 00:00:00 2001 From: PopeRigby Date: Mon, 9 Dec 2024 14:48:39 -0800 Subject: [PATCH 09/13] Fix formatting again --- pkgs/by-name/ta/tacent/package.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ta/tacent/package.nix b/pkgs/by-name/ta/tacent/package.nix index e1d14b40c1bc..00c343496569 100644 --- a/pkgs/by-name/ta/tacent/package.nix +++ b/pkgs/by-name/ta/tacent/package.nix @@ -1,4 +1,10 @@ -{ cmake, fetchFromGitHub, lib, ninja, stdenv, }: +{ + cmake, + fetchFromGitHub, + lib, + ninja, + stdenv, +}: stdenv.mkDerivation rec { pname = "tacent"; @@ -11,11 +17,13 @@ stdenv.mkDerivation rec { hash = "sha256-z8VuJS8OaVw5CeO/udvBEmcURKIy1oWVYUv6Ai8lTI8="; }; - nativeBuildInputs = [ cmake ninja ]; + nativeBuildInputs = [ + cmake + ninja + ]; meta = { - description = - "C++ library providing linear algebra and various utility functions"; + description = "C++ library providing linear algebra and various utility functions"; longDescription = '' A C++ library implementing linear algebra, text and file IO, UTF-N conversions, containers, image loading/saving, image quantization/filtering, command-line parsing, etc. From 57befb66f983b46b964d7530918a534a7a3b08d5 Mon Sep 17 00:00:00 2001 From: PopeRigby Date: Tue, 10 Dec 2024 21:29:25 -0800 Subject: [PATCH 10/13] Update pkgs/by-name/ta/tacent/package.nix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Gaétan Lepage <33058747+GaetanLepage@users.noreply.github.com> --- pkgs/by-name/ta/tacent/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ta/tacent/package.nix b/pkgs/by-name/ta/tacent/package.nix index 00c343496569..fca8dad14a75 100644 --- a/pkgs/by-name/ta/tacent/package.nix +++ b/pkgs/by-name/ta/tacent/package.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "bluescan"; repo = "tacent"; - tag = version; + tag = "v${version}";; hash = "sha256-z8VuJS8OaVw5CeO/udvBEmcURKIy1oWVYUv6Ai8lTI8="; }; From 3b0562d4a4e128904ed9f38d8e5aaa837640347d Mon Sep 17 00:00:00 2001 From: PopeRigby Date: Tue, 10 Dec 2024 21:29:33 -0800 Subject: [PATCH 11/13] Update pkgs/by-name/ta/tacent/package.nix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Gaétan Lepage <33058747+GaetanLepage@users.noreply.github.com> --- pkgs/by-name/ta/tacent/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ta/tacent/package.nix b/pkgs/by-name/ta/tacent/package.nix index fca8dad14a75..a26d678b81b8 100644 --- a/pkgs/by-name/ta/tacent/package.nix +++ b/pkgs/by-name/ta/tacent/package.nix @@ -6,7 +6,7 @@ stdenv, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "tacent"; version = "0.8.18"; From 992670d21767ffabe03df62a37eb9f9aca0980ab Mon Sep 17 00:00:00 2001 From: PopeRigby Date: Thu, 12 Dec 2024 20:38:02 -0800 Subject: [PATCH 12/13] Use finalAttrs --- pkgs/by-name/ta/tacent/package.nix | 8 ++++---- pkgs/by-name/ta/tacentview/package.nix | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/ta/tacent/package.nix b/pkgs/by-name/ta/tacent/package.nix index 00c343496569..e6f38531bd55 100644 --- a/pkgs/by-name/ta/tacent/package.nix +++ b/pkgs/by-name/ta/tacent/package.nix @@ -6,14 +6,14 @@ stdenv, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "tacent"; version = "0.8.18"; src = fetchFromGitHub { owner = "bluescan"; repo = "tacent"; - tag = version; + tag = finalAttrs.version; hash = "sha256-z8VuJS8OaVw5CeO/udvBEmcURKIy1oWVYUv6Ai8lTI8="; }; @@ -29,9 +29,9 @@ stdenv.mkDerivation rec { containers, image loading/saving, image quantization/filtering, command-line parsing, etc. ''; homepage = "https://github.com/bluescan/tacent"; - changelog = "https://github.com/bluescan/tacent/releases/tag/v${version}"; + changelog = "https://github.com/bluescan/tacent/releases/tag/v${finalAttrs.version}"; license = lib.licenses.isc; maintainers = with lib.maintainers; [ PopeRigby ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/ta/tacentview/package.nix b/pkgs/by-name/ta/tacentview/package.nix index 9d1a19b41ca2..358b140573b3 100644 --- a/pkgs/by-name/ta/tacentview/package.nix +++ b/pkgs/by-name/ta/tacentview/package.nix @@ -12,14 +12,14 @@ zenity, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "tacentview"; version = "1.0.46"; src = fetchFromGitHub { owner = "bluescan"; repo = "tacentview"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-d4A26p1hmkYEZ+h6kRbHHr4QmAc3PMe3qYdkeKIRGkU="; }; @@ -61,10 +61,10 @@ stdenv.mkDerivation rec { meta = { description = "Image and texture viewer"; homepage = "https://github.com/bluescan/tacentview"; - changelog = "https://github.com/bluescan/tacentview/releases/tag/v${version}"; + changelog = "https://github.com/bluescan/tacentview/releases/tag/v${finalAttrs.version}"; license = lib.licenses.isc; maintainers = with lib.maintainers; [ PopeRigby ]; mainProgram = "tacentview"; platforms = with lib.platforms; linux ++ windows; }; -} +}) From f4a439136b44bb2320c429e924f7b330630253ea Mon Sep 17 00:00:00 2001 From: PopeRigby Date: Fri, 13 Dec 2024 14:03:10 -0800 Subject: [PATCH 13/13] Update pkgs/by-name/ta/tacent/package.nix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Gaétan Lepage <33058747+GaetanLepage@users.noreply.github.com> --- pkgs/by-name/ta/tacent/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/ta/tacent/package.nix b/pkgs/by-name/ta/tacent/package.nix index e6f38531bd55..a55a4e950426 100644 --- a/pkgs/by-name/ta/tacent/package.nix +++ b/pkgs/by-name/ta/tacent/package.nix @@ -33,5 +33,9 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.isc; maintainers = with lib.maintainers; [ PopeRigby ]; platforms = lib.platforms.linux; + badPlatforms = [ + # /build/source/UnitTests/Src/UnitTests.cpp:149:15: error: 'Rule' is not a member of 'tUnitTest' + "aarch64-linux" + ]; }; })