From 5dc5f11215a00a17867676028ec452a43260d123 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Thu, 9 May 2024 00:28:45 +0200 Subject: [PATCH 1/2] coost: 3.0.0 -> 3.0.2 --- pkgs/development/libraries/coost/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/coost/default.nix b/pkgs/development/libraries/coost/default.nix index 7a259d44faf0..aee602c48aa8 100644 --- a/pkgs/development/libraries/coost/default.nix +++ b/pkgs/development/libraries/coost/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "coost"; - version = "3.0.0"; + version = "3.0.2"; src = fetchFromGitHub { owner = "idealvin"; repo = pname; rev = "v${version}"; - sha256 = "sha256-qpJh1yl0lYYszNHGo5Jkbzal2hnVzg7UUxiyg/Grva8="; + sha256 = "sha256-HbMenAL/UWsqQ1o7cMeWfwXkLh4GxIKV7iuZQD3hDA8="; }; postPatch = '' From 1b448e33fe127e50b9cb77de403088964f8c05f4 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Thu, 9 May 2024 00:31:01 +0200 Subject: [PATCH 2/2] coost: migrate to by-name --- .../default.nix => by-name/co/coost/package.nix} | 11 ++++++----- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 6 insertions(+), 7 deletions(-) rename pkgs/{development/libraries/coost/default.nix => by-name/co/coost/package.nix} (84%) diff --git a/pkgs/development/libraries/coost/default.nix b/pkgs/by-name/co/coost/package.nix similarity index 84% rename from pkgs/development/libraries/coost/default.nix rename to pkgs/by-name/co/coost/package.nix index aee602c48aa8..648d0f9f4db3 100644 --- a/pkgs/development/libraries/coost/default.nix +++ b/pkgs/by-name/co/coost/package.nix @@ -10,15 +10,15 @@ withOpenSSL ? true, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "coost"; version = "3.0.2"; src = fetchFromGitHub { owner = "idealvin"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-HbMenAL/UWsqQ1o7cMeWfwXkLh4GxIKV7iuZQD3hDA8="; + repo = "coost"; + rev = "v${finalAttrs.version}"; + hash = "sha256-HbMenAL/UWsqQ1o7cMeWfwXkLh4GxIKV7iuZQD3hDA8="; }; postPatch = '' @@ -34,6 +34,7 @@ stdenv.mkDerivation rec { "-DBUILD_SHARED_LIBS=ON" ] ++ lib.optional withCurl "-DWITH_LIBCURL=ON" ++ lib.optional withOpenSSL "-DWITH_OPENSSL=ON"; + outputs = [ "out" "dev" ]; passthru.updateScript = gitUpdater { }; meta = with lib; { @@ -43,4 +44,4 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.sigmanificient ]; platforms = platforms.unix; }; -} +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a38897c6125b..9340be778bbb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -542,8 +542,6 @@ with pkgs; coolercontrol = recurseIntoAttrs (callPackage ../applications/system/coolercontrol { }); - coost = callPackage ../development/libraries/coost { }; - confetty = callPackage ../applications/misc/confetty { }; confy = callPackage ../applications/misc/confy { };