From 8caad59a02a309f190aef40a5df07c78b01fb7ea Mon Sep 17 00:00:00 2001 From: Ryan Omasta Date: Wed, 7 Aug 2024 17:45:27 -0600 Subject: [PATCH 1/3] sherlock: 0-unstable-2024-06-09 -> 0.15.0 --- pkgs/by-name/sh/sherlock/package.nix | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/sh/sherlock/package.nix b/pkgs/by-name/sh/sherlock/package.nix index cdf40eacedae..463663bf472f 100644 --- a/pkgs/by-name/sh/sherlock/package.nix +++ b/pkgs/by-name/sh/sherlock/package.nix @@ -8,14 +8,14 @@ python3.pkgs.buildPythonApplication rec { pname = "sherlock"; - version = "0-unstable-2024-06-09"; + version = "0.15.0"; format = "pyproject"; src = fetchFromGitHub { owner = "sherlock-project"; repo = "sherlock"; - rev = "d678908c00f16c7f6c44efc0357cef713fa96739"; - hash = "sha256-XAXDqbdHQta9OiupbPmmyp3TK1VLtDQ7CadsOei/6rs="; + rev = "refs/tags/v${version}"; + hash = "sha256-+fQDvvwsLpiEvy+vC49AzlOA/KaKrhhpS97sZvFbpLA="; }; patches = [ @@ -45,7 +45,7 @@ python3.pkgs.buildPythonApplication rec { runHook preInstall mkdir -p $out/bin $out/share - cp -R ./sherlock $out/share + cp -R ./sherlock_project $out/share runHook postInstall ''; @@ -53,7 +53,7 @@ python3.pkgs.buildPythonApplication rec { postFixup = '' makeWrapper ${python3.interpreter} $out/bin/sherlock \ --add-flags "-m" \ - --add-flags "sherlock" \ + --add-flags "sherlock_project" \ --prefix PYTHONPATH : "$PYTHONPATH:$out/share" ''; @@ -76,10 +76,6 @@ python3.pkgs.buildPythonApplication rec { "'not online'" ]; - passthru.updateScript = unstableGitUpdater { - hardcodeZeroVersion = true; - }; - meta = with lib; { homepage = "https://sherlock-project.github.io/"; description = "Hunt down social media accounts by username across social networks"; From f9b9b31c972d28ada6a2e3c0d7173c59c1c7359d Mon Sep 17 00:00:00 2001 From: Ryan Omasta Date: Wed, 7 Aug 2024 17:47:32 -0600 Subject: [PATCH 2/3] sherlock: format using nixfmt-rfc-style --- pkgs/by-name/sh/sherlock/package.nix | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/sh/sherlock/package.nix b/pkgs/by-name/sh/sherlock/package.nix index 463663bf472f..4d7cb6a688a0 100644 --- a/pkgs/by-name/sh/sherlock/package.nix +++ b/pkgs/by-name/sh/sherlock/package.nix @@ -1,9 +1,10 @@ -{ lib -, fetchFromGitHub -, makeWrapper -, python3 -, unstableGitUpdater -, poetry +{ + lib, + fetchFromGitHub, + makeWrapper, + python3, + unstableGitUpdater, + poetry, }: python3.pkgs.buildPythonApplication rec { @@ -67,9 +68,7 @@ python3.pkgs.buildPythonApplication rec { pythonRelaxDepsHook ]; - pythonRelaxDeps = [ - "stem" - ]; + pythonRelaxDeps = [ "stem" ]; pytestFlagsArray = [ "-m" From d0d10b0a445afd8b9c756cbfaeefb8a3e5d82cd1 Mon Sep 17 00:00:00 2001 From: Ryan Omasta Date: Wed, 7 Aug 2024 17:49:58 -0600 Subject: [PATCH 3/3] sherlock: remove uses of with lib --- pkgs/by-name/sh/sherlock/package.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/sh/sherlock/package.nix b/pkgs/by-name/sh/sherlock/package.nix index 4d7cb6a688a0..9d96cc3da382 100644 --- a/pkgs/by-name/sh/sherlock/package.nix +++ b/pkgs/by-name/sh/sherlock/package.nix @@ -3,7 +3,6 @@ fetchFromGitHub, makeWrapper, python3, - unstableGitUpdater, poetry, }: @@ -75,11 +74,11 @@ python3.pkgs.buildPythonApplication rec { "'not online'" ]; - meta = with lib; { + meta = { homepage = "https://sherlock-project.github.io/"; description = "Hunt down social media accounts by username across social networks"; - license = licenses.mit; + license = lib.licenses.mit; mainProgram = "sherlock"; - maintainers = with maintainers; [ applePrincess ]; + maintainers = with lib.maintainers; [ applePrincess ]; }; }