Unverified Commit 4e64a102 authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #287056 from TomaSajt/smb3-foundry 

smb3-foundry: clean up installPhase, move to pkgs/by-name
parents b6340977 3cbc0a78

pkgs/applications/misc/smb3-foundry/default.nix→pkgs/by-name/sm/smb3-foundry/package.nix

+6 −9
Original line number Diff line number Diff line
@@ -2,11 +2,10 @@ 
, stdenv

, fetchFromGitHub

, python3

, makeWrapper

}:



let

  pythonEnv = (python3.withPackages (ps: with ps; [

  python = (python3.withPackages (ps: with ps; [

    pyside6

    py65

    qdarkstyle
@@ -23,18 +22,16 @@ stdenv.mkDerivation (finalAttrs: { 
    hash = "sha256-8cf7VhvC372Cqi94n2FSHcoCGblpZoZvBXcXq5jU6CY=";

  };



  nativeBuildInputs = [ makeWrapper ];

  buildInputs = [ python ];



  installPhase = ''

    runHook preInstall



    mkdir -p $out/app

    cp -R smb3parse foundry scribe data doc VERSION smb3-foundry.py smb3-scribe.py $out/app

    mkdir -p $out/share/smb3-foundry $out/bin

    cp -r smb3parse foundry scribe data doc VERSION smb3-foundry.py smb3-scribe.py $out/share/smb3-foundry



    makeWrapper ${pythonEnv}/bin/python $out/bin/smb3-foundry \

          --add-flags "$out/app/smb3-foundry.py"

    makeWrapper ${pythonEnv}/bin/python $out/bin/smb3-scribe \

          --add-flags "$out/app/smb3-scribe.py"

    ln -s $out/share/smb3-foundry/smb3-foundry.py $out/bin/smb3-foundry

    ln -s $out/share/smb3-foundry/smb3-scribe.py $out/bin/smb3-scribe



    runHook postInstall

  '';

pkgs/top-level/all-packages.nix

+0 −4
Original line number Diff line number Diff line
@@ -2050,10 +2050,6 @@ with pkgs; 














  sorted-grep = callPackage ../tools/text/sorted-grep { };



























  smb3-foundry = callPackage ../applications/misc/smb3-foundry {













    python3 = python311;













  };



























  smbmap = callPackage ../tools/security/smbmap { };





























  smbscan = callPackage ../tools/security/smbscan { };